summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2014-12-15 14:52:51 -0800
committerJoffrey F <joffrey@docker.com>2014-12-15 14:52:51 -0800
commitbf9e1c84baa4167636a6014a22a6f8484fbcdb07 (patch)
treea77d42bb278d41f460e63fd39e64bfe878de595b
parenta4aa1a88f112c02d331299cd9ed15903ab884b0b (diff)
downloaddocker-py-0.6.0-integration.tar.gz
Don't use old test image (deprecated ID scheme)0.6.0-integration
-rw-r--r--tests/integration_test.py22
1 files changed, 8 insertions, 14 deletions
diff --git a/tests/integration_test.py b/tests/integration_test.py
index ba9774a..75399a1 100644
--- a/tests/integration_test.py
+++ b/tests/integration_test.py
@@ -767,39 +767,33 @@ class TestPull(BaseTestCase):
def runTest(self):
self.client = docker.Client(base_url=DEFAULT_BASE_URL, timeout=10)
try:
- self.client.remove_image('joffrey/test001')
- self.client.remove_image('376968a23351')
+ self.client.remove_image('busybox')
except docker.errors.APIError:
pass
- res = self.client.pull('joffrey/test001')
+ res = self.client.pull('busybox')
self.assertEqual(type(res), six.text_type)
self.assertGreaterEqual(
- self.client.images('joffrey/test001'), 1
+ self.client.images('busybox'), 1
)
- img_info = self.client.inspect_image('joffrey/test001')
+ img_info = self.client.inspect_image('busybox')
self.assertIn('Id', img_info)
- self.tmp_imgs.append('joffrey/test001')
- self.tmp_imgs.append('376968a23351')
class TestPullStream(BaseTestCase):
def runTest(self):
self.client = docker.Client(base_url=DEFAULT_BASE_URL, timeout=10)
try:
- self.client.remove_image('joffrey/test001')
- self.client.remove_image('376968a23351')
+ self.client.remove_image('busybox')
except docker.errors.APIError:
pass
- stream = self.client.pull('joffrey/test001', stream=True)
+ stream = self.client.pull('busybox', stream=True)
for chunk in stream:
json.loads(chunk) # ensure chunk is a single, valid JSON blob
self.assertGreaterEqual(
- self.client.images('joffrey/test001'), 1
+ self.client.images('busybox'), 1
)
- img_info = self.client.inspect_image('joffrey/test001')
+ img_info = self.client.inspect_image('busybox')
self.assertIn('Id', img_info)
- self.tmp_imgs.append('joffrey/test001')
- self.tmp_imgs.append('376968a23351')
class TestCommit(BaseTestCase):