update tests for a new docker-py library version

Author: kelvich

tests2/lib/failure_injector.py

@@ -3,11 +3,11 @@
 class FailureInjector(object):
 
     def __init__(self):
-        self.docker_api = docker.Client()
+        self.docker_api = docker.from_env()
 
     def container_exec(self, node, command):
-        exec_id = self.docker_api.exec_create(node, command, user='root')
-        output = self.docker_api.exec_start(exec_id)
+        docker_node = self.docker_api.containers.get(node)
+        docker_node.exec_run(command, user='root')
 
 class NoFailure(FailureInjector):
 
@@ -57,10 +57,10 @@ def __init__(self, node):
 
     # XXX: Is it really a good idea to call cli.stop inside method called start?
     def start(self):
-        self.docker_api.stop(self.node)
+        self.docker_api.containers.get(self.node).stop()
 
     def stop(self):
-        self.docker_api.start(self.node)
+        self.docker_api.containers.get(self.node).start()
 
 
 class CrashRecoverNode(FailureInjector):
@@ -70,10 +70,10 @@ def __init__(self, node):
         super().__init__()
 
     def start(self):
-        self.docker_api.kill(self.node)
+        self.docker_api.containers.get(self.node).kill()
 
     def stop(self):
-        self.docker_api.start(self.node)
+        self.docker_api.containers.get(self.node).start()
 
 
 class SkewTime(FailureInjector):
@@ -90,7 +90,7 @@ def __init__(self, node):
 
     # XXX: Is it really a good idea to call cli.stop inside method called start?
     def start(self):
-        self.docker_api.stop(self.node)
+        self.docker_api.containers.get(self.node).stop()
 
     def stop(self):
         return
@@ -107,4 +107,4 @@ def start(self):
         return
 
     def stop(self):
-        self.docker_api.start(self.node)
+        self.docker_api.containers.get(self.node).start()

tests2/lib/test_helper.py

@@ -24,7 +24,7 @@ def assertCommits(self, aggs):
             commits = commits and 'commit' in agg['transfer']['finish']
         if not commits:
             print('No commits during aggregation interval')
-            time.sleep(100000)
+            # time.sleep(100000)
             raise AssertionError('No commits during aggregation interval')
 
     def assertNoCommits(self, aggs):

tests2/requirements.txt

@@ -1,18 +1,15 @@
-aiopg==0.12.0
-aioprocessing==0.0.1
-astroid==1.4.8
-docker-py==1.10.6
+aiopg==0.13.1
+aioprocessing==1.0.0
+cached-property==1.3.1
+docker==2.5.1
+docker-compose==1.16.1
 docker-pycreds==0.2.1
-isort==4.2.5
-lazy-object-proxy==1.2.2
-mccabe==0.5.2
-pdb==0.1
-pi==0.1.2
-psycopg2==2.6.2
-pylint==1.6.4
-python-gnupg==0.3.9
+dockerpty==0.4.1
+docopt==0.6.2
+jsonschema==2.6.0
+psycopg2==2.7.3.1
 PyYAML==3.12
-requests==2.12.1
-six==1.10.0
-websocket-client==0.37.0
-wrapt==1.10.8
+requests==2.11.1
+six==1.11.0
+texttable==0.9.1
+websocket-client==0.44.0

tests2/test_recovery.py

@@ -33,7 +33,7 @@ def assertCommits(self, aggs):
             commits = commits and 'commit' in agg['transfer']['finish']
         if not commits:
             print('No commits during aggregation interval')
-            time.sleep(100000)
+            # time.sleep(100000)
             raise AssertionError('No commits during aggregation interval')
 
     def assertNoCommits(self, aggs):

tests2/test_referee.py

@@ -131,8 +131,8 @@ def test_winner_restart(self):
         self.assertIsolation(aggs)
 
         # need to start node1 to perform consequent tests
-        docker_api = docker.Client()
-        docker_api.start('node1')
+        docker_api = docker.from_env()
+        docker_api.containers.get('node1').start()
         time.sleep(35)