From 4b91a71313735c61ab5345571ec85fb7540da3a6 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Mon, 15 Dec 2014 12:11:54 -0800 Subject: [PATCH 1/3] Longer timeout when contacting hub --- tests/integration_test.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/integration_test.py b/tests/integration_test.py index 1eeec95a..301bd8a1 100644 --- a/tests/integration_test.py +++ b/tests/integration_test.py @@ -83,6 +83,7 @@ class TestInfo(BaseTestCase): class TestSearch(BaseTestCase): def runTest(self): + self.client = docker.Client(base_url=DEFAULT_BASE_URL, timeout=10) res = self.client.search('busybox') self.assertTrue(len(res) >= 1) base_img = [x for x in res if x['name'] == 'busybox'] @@ -764,6 +765,7 @@ class TestRemoveLink(BaseTestCase): 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') @@ -783,6 +785,7 @@ class TestPull(BaseTestCase): 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') From a4aa1a88f112c02d331299cd9ed15903ab884b0b Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Mon, 15 Dec 2014 13:53:49 -0800 Subject: [PATCH 2/3] Better pull confirmation --- tests/integration_test.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/integration_test.py b/tests/integration_test.py index 301bd8a1..ba9774a1 100644 --- a/tests/integration_test.py +++ b/tests/integration_test.py @@ -771,12 +771,11 @@ class TestPull(BaseTestCase): self.client.remove_image('376968a23351') except docker.errors.APIError: pass - info = self.client.info() - self.assertIn('Images', info) - img_count = info['Images'] res = self.client.pull('joffrey/test001') self.assertEqual(type(res), six.text_type) - self.assertEqual(img_count + 3, self.client.info()['Images']) + self.assertGreaterEqual( + self.client.images('joffrey/test001'), 1 + ) img_info = self.client.inspect_image('joffrey/test001') self.assertIn('Id', img_info) self.tmp_imgs.append('joffrey/test001') @@ -791,13 +790,12 @@ class TestPullStream(BaseTestCase): self.client.remove_image('376968a23351') except docker.errors.APIError: pass - info = self.client.info() - self.assertIn('Images', info) - img_count = info['Images'] stream = self.client.pull('joffrey/test001', stream=True) for chunk in stream: json.loads(chunk) # ensure chunk is a single, valid JSON blob - self.assertEqual(img_count + 3, self.client.info()['Images']) + self.assertGreaterEqual( + self.client.images('joffrey/test001'), 1 + ) img_info = self.client.inspect_image('joffrey/test001') self.assertIn('Id', img_info) self.tmp_imgs.append('joffrey/test001') From bf9e1c84baa4167636a6014a22a6f8484fbcdb07 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Mon, 15 Dec 2014 14:52:51 -0800 Subject: [PATCH 3/3] Don't use old test image (deprecated ID scheme) --- tests/integration_test.py | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/tests/integration_test.py b/tests/integration_test.py index ba9774a1..75399a17 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):