Commit 939d5454 authored by Samuel GAIST's avatar Samuel GAIST Committed by Samuel Gaist

[test] Pre-commit cleanup

parent a2a35d40
...@@ -43,6 +43,7 @@ import unittest ...@@ -43,6 +43,7 @@ import unittest
import simplejson as json import simplejson as json
import zmq import zmq
from flaky import flaky from flaky import flaky
from ..bcp import broker from ..bcp import broker
......
...@@ -39,6 +39,7 @@ import os ...@@ -39,6 +39,7 @@ import os
import tempfile import tempfile
import time import time
import unittest import unittest
from tempfile import TemporaryDirectory from tempfile import TemporaryDirectory
import pkg_resources import pkg_resources
......
...@@ -306,7 +306,8 @@ class TestDockerExecution(BaseExecutionMixIn): ...@@ -306,7 +306,8 @@ class TestDockerExecution(BaseExecutionMixIn):
def test_loop_mix_db_env_error(self): def test_loop_mix_db_env_error(self):
with nose.tools.assert_raises(RuntimeError) as context: with nose.tools.assert_raises(RuntimeError) as context:
self.execute( self.execute(
"errors/user/loop/1/loop_mix_db_env", [None], "errors/user/loop/1/loop_mix_db_env",
[None],
) )
nose.tools.assert_true( nose.tools.assert_true(
...@@ -317,7 +318,8 @@ class TestDockerExecution(BaseExecutionMixIn): ...@@ -317,7 +318,8 @@ class TestDockerExecution(BaseExecutionMixIn):
def test_loop_two_db_env_error(self): def test_loop_two_db_env_error(self):
with nose.tools.assert_raises(RuntimeError) as context: with nose.tools.assert_raises(RuntimeError) as context:
self.execute( self.execute(
"errors/user/loop/1/loop_two_db_environments", [None], "errors/user/loop/1/loop_two_db_environments",
[None],
) )
nose.tools.assert_true( nose.tools.assert_true(
...@@ -328,7 +330,8 @@ class TestDockerExecution(BaseExecutionMixIn): ...@@ -328,7 +330,8 @@ class TestDockerExecution(BaseExecutionMixIn):
def test_single_not_existing_db_env_error(self): def test_single_not_existing_db_env_error(self):
with nose.tools.assert_raises(RuntimeError) as context: with nose.tools.assert_raises(RuntimeError) as context:
self.execute( self.execute(
"errors/user/single/1/not_existing_db_env", [None], "errors/user/single/1/not_existing_db_env",
[None],
) )
nose.tools.assert_true( nose.tools.assert_true(
......
...@@ -40,6 +40,7 @@ import glob ...@@ -40,6 +40,7 @@ import glob
import logging import logging
import os import os
import subprocess as sp # nosec import subprocess as sp # nosec
from shutil import rmtree from shutil import rmtree
import nose.tools import nose.tools
...@@ -95,8 +96,7 @@ def clear_conda_environment(environment_prefix): ...@@ -95,8 +96,7 @@ def clear_conda_environment(environment_prefix):
class BaseExecutionMixIn(object): class BaseExecutionMixIn(object):
def check_output(self, prefix, path): def check_output(self, prefix, path):
"""Checks if a given output exists, together with its indexes and checksums """Checks if a given output exists, together with its indexes and checksums"""
"""
finalpath = os.path.join(prefix, path) finalpath = os.path.join(prefix, path)
datafiles = glob.glob(finalpath + "*.data") datafiles = glob.glob(finalpath + "*.data")
......
...@@ -40,10 +40,12 @@ import multiprocessing ...@@ -40,10 +40,12 @@ import multiprocessing
import os import os
import queue import queue
import unittest import unittest
from time import sleep from time import sleep
from time import time from time import time
import simplejson as json import simplejson as json
from ddt import ddt from ddt import ddt
from ddt import idata from ddt import idata
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment