Update for new versions of docker-sdk

avirshup · Apr 4, 2018 · d522eec · d522eec
1 parent 19b89c9
commit d522eec
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
 termcolor
-docker >=3.0
+docker >=3.2
 future
 pyyaml
diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@
                   ]
         },
         install_requires=['termcolor',
-                          'docker',
+                          'docker>=3.2',
                           'future',
                           'pyyaml'],
 )
diff --git a/test/helpers.py b/test/helpers.py
@@ -33,7 +33,10 @@ def fixture():
         yield
 
         for name in imgnames:  # force it to also remove the containers
-            client.images.remove(name, force=True)
+            try:
+                client.images.remove(name, force=True)
+            except docker.errors.ImageNotFound:
+                pass
     return fixture
 
 
@@ -51,10 +54,11 @@ def assert_file_content(imgname, path, content):
 
     try:
         tarstream, stat = container.get_archive(path)
+        actual_content = b''.join(tarstream)
     except docker.errors.NotFound:
         assert False, 'File %s not found' % path
     container.remove()
 
-    tf = tarfile.open(fileobj=io.BytesIO(tarstream.read()))
+    tf = tarfile.open(fileobj=io.BytesIO(actual_content))
     val = tf.extractfile(os.path.basename(path)).read().decode('utf-8')
     assert val.strip() == content