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

Fix volumes tests for API version >= 1.20 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2015-09-11 17:04:20 -07:00
parent 8c270dfdf0
commit d6a86e1d69
1 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tests/integration_test.py
View File

@ -264,14 +264,25 @@ class TestCreateContainerWithBinds(BaseTestCase):
if six.PY3: if six.PY3:
logs = logs.decode('utf-8') logs = logs.decode('utf-8')
self.assertIn(self.filename, logs) self.assertIn(self.filename, logs)
# FIXME: format changes in API version >= 1.20
inspect_data = self.client.inspect_container(container) inspect_data = self.client.inspect_container(container)
self.assertEqual( if docker.utils.compare_version('1.20', self.client._version) < 0:
self.mount_origin, self.assertIn('Volumes', inspect_data)
inspect_data['Volumes'][self.mount_dest] self.assertIn(self.mount_dest, inspect_data['Volumes'])
) self.assertEqual(
self.assertTrue(inspect_data['VolumesRW'][self.mount_dest]) self.mount_origin, inspect_data['Volumes'][self.mount_dest]
)
self.assertIn(self.mount_dest, inspect_data['VolumesRW'])
self.assertTrue(inspect_data['VolumesRW'][self.mount_dest])
else:
self.assertIn('Mounts', inspect_data)
filtered = filter(
lambda x: x['Destination'] == self.mount_dest,
inspect_data['Mounts']
)
self.assertEqual(len(filtered), 1)
mount_data = filtered[0]
self.assertEqual(mount_data['Source'], self.mount_origin)
self.assertTrue(mount_data['RW'])
def test_ro(self): def test_ro(self):
container = self.run_with_volume( container = self.run_with_volume(
@ -285,13 +296,26 @@ class TestCreateContainerWithBinds(BaseTestCase):
logs = logs.decode('utf-8') logs = logs.decode('utf-8')
self.assertIn(self.filename, logs) self.assertIn(self.filename, logs)
# FIXME: format changes in API version >= 1.20 self.assertIn(self.filename, logs)
inspect_data = self.client.inspect_container(container) inspect_data = self.client.inspect_container(container)
self.assertEqual( if docker.utils.compare_version('1.20', self.client._version) < 0:
self.mount_origin, self.assertIn('Volumes', inspect_data)
inspect_data['Volumes'][self.mount_dest] self.assertIn(self.mount_dest, inspect_data['Volumes'])
) self.assertEqual(
self.assertFalse(inspect_data['VolumesRW'][self.mount_dest]) self.mount_origin, inspect_data['Volumes'][self.mount_dest]
)
self.assertIn(self.mount_dest, inspect_data['VolumesRW'])
self.assertFalse(inspect_data['VolumesRW'][self.mount_dest])
else:
self.assertIn('Mounts', inspect_data)
filtered = filter(
lambda x: x['Destination'] == self.mount_dest,
inspect_data['Mounts']
)
self.assertEqual(len(filtered), 1)
mount_data = filtered[0]
self.assertEqual(mount_data['Source'], self.mount_origin)
self.assertFalse(mount_data['RW'])
@requires_api_version('1.20') @requires_api_version('1.20')
@ -325,6 +349,7 @@ class CreateContainerWithGroupAddTest(BaseTestCase):
logs = self.client.logs(container) logs = self.client.logs(container)
if six.PY3: if six.PY3:
logs = logs.decode('utf-8') logs = logs.decode('utf-8')
groups = logs.strip().split(' ') groups = logs.strip().split(' ')
self.assertIn('1000', groups) self.assertIn('1000', groups)
self.assertIn('1001', groups) self.assertIn('1001', groups)