diff --git a/tests/integration_test.py b/tests/integration_test.py index 1eeec95a..75399a17 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,41 +765,35 @@ 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') + self.client.remove_image('busybox') except docker.errors.APIError: pass - info = self.client.info() - self.assertIn('Images', info) - img_count = info['Images'] - res = self.client.pull('joffrey/test001') + res = self.client.pull('busybox') self.assertEqual(type(res), six.text_type) - self.assertEqual(img_count + 3, self.client.info()['Images']) - img_info = self.client.inspect_image('joffrey/test001') + self.assertGreaterEqual( + self.client.images('busybox'), 1 + ) + 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 - info = self.client.info() - self.assertIn('Images', info) - img_count = info['Images'] - 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.assertEqual(img_count + 3, self.client.info()['Images']) - img_info = self.client.inspect_image('joffrey/test001') + self.assertGreaterEqual( + self.client.images('busybox'), 1 + ) + 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):