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

Merge pull request #423 from docker/0.6.0-integration 

Fixed integration tests
This commit is contained in:
Joffrey F 2014-12-15 15:01:20 -08:00
parent a7cce1d600 bf9e1c84ba
commit 73b15be0c1
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tests/integration_test.py
View File

@ -83,6 +83,7 @@ class TestInfo(BaseTestCase):
class TestSearch(BaseTestCase): class TestSearch(BaseTestCase):
def runTest(self): def runTest(self):
self.client = docker.Client(base_url=DEFAULT_BASE_URL, timeout=10)
res = self.client.search('busybox') res = self.client.search('busybox')
self.assertTrue(len(res) >= 1) self.assertTrue(len(res) >= 1)
base_img = [x for x in res if x['name'] == 'busybox'] base_img = [x for x in res if x['name'] == 'busybox']
@ -764,41 +765,35 @@ class TestRemoveLink(BaseTestCase):
class TestPull(BaseTestCase): class TestPull(BaseTestCase):
def runTest(self): def runTest(self):
self.client = docker.Client(base_url=DEFAULT_BASE_URL, timeout=10)
try: try:
self.client.remove_image('joffrey/test001') self.client.remove_image('busybox')
self.client.remove_image('376968a23351')
except docker.errors.APIError: except docker.errors.APIError:
pass pass
info = self.client.info() res = self.client.pull('busybox')
self.assertIn('Images', info)
img_count = info['Images']
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(
img_info = self.client.inspect_image('joffrey/test001') self.client.images('busybox'), 1
)
img_info = self.client.inspect_image('busybox')
self.assertIn('Id', img_info) self.assertIn('Id', img_info)
self.tmp_imgs.append('joffrey/test001')
self.tmp_imgs.append('376968a23351')
class TestPullStream(BaseTestCase): class TestPullStream(BaseTestCase):
def runTest(self): def runTest(self):
self.client = docker.Client(base_url=DEFAULT_BASE_URL, timeout=10)
try: try:
self.client.remove_image('joffrey/test001') self.client.remove_image('busybox')
self.client.remove_image('376968a23351')
except docker.errors.APIError: except docker.errors.APIError:
pass pass
info = self.client.info() stream = self.client.pull('busybox', stream=True)
self.assertIn('Images', info)
img_count = info['Images']
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(
img_info = self.client.inspect_image('joffrey/test001') self.client.images('busybox'), 1
)
img_info = self.client.inspect_image('busybox')
self.assertIn('Id', img_info) self.assertIn('Id', img_info)
self.tmp_imgs.append('joffrey/test001')
self.tmp_imgs.append('376968a23351')
class TestCommit(BaseTestCase): class TestCommit(BaseTestCase):