docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better pull confirmation

This commit is contained in:
Joffrey F 2014-12-15 13:53:49 -08:00
parent 4b91a71313
commit a4aa1a88f1
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/integration_test.py
View File

@ -771,12 +771,11 @@ class TestPull(BaseTestCase):
self.client.remove_image('376968a23351') self.client.remove_image('376968a23351')
except docker.errors.APIError: except docker.errors.APIError:
pass pass
info = self.client.info()
self.assertIn('Images', info)
img_count = info['Images']
res = self.client.pull('joffrey/test001') res = self.client.pull('joffrey/test001')
self.assertEqual(type(res), six.text_type) 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') img_info = self.client.inspect_image('joffrey/test001')
self.assertIn('Id', img_info) self.assertIn('Id', img_info)
self.tmp_imgs.append('joffrey/test001') self.tmp_imgs.append('joffrey/test001')
@ -791,13 +790,12 @@ class TestPullStream(BaseTestCase):
self.client.remove_image('376968a23351') self.client.remove_image('376968a23351')
except docker.errors.APIError: except docker.errors.APIError:
pass 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('joffrey/test001', stream=True)
for chunk in stream: for chunk in stream:
json.loads(chunk) # ensure chunk is a single, valid JSON blob 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') img_info = self.client.inspect_image('joffrey/test001')
self.assertIn('Id', img_info) self.assertIn('Id', img_info)
self.tmp_imgs.append('joffrey/test001') self.tmp_imgs.append('joffrey/test001')