Kaydet (Commit) da2b7973 authored tarafından Joffrey F's avatar Joffrey F

Improve volume bindings integration test

Signed-off-by: 's avatarJoffrey F <joffrey@docker.com>
üst d6a86e1d
...@@ -265,24 +265,7 @@ class TestCreateContainerWithBinds(BaseTestCase): ...@@ -265,24 +265,7 @@ class TestCreateContainerWithBinds(BaseTestCase):
logs = logs.decode('utf-8') logs = logs.decode('utf-8')
self.assertIn(self.filename, logs) self.assertIn(self.filename, logs)
inspect_data = self.client.inspect_container(container) inspect_data = self.client.inspect_container(container)
if docker.utils.compare_version('1.20', self.client._version) < 0: self.check_container_data(inspect_data, True)
self.assertIn('Volumes', inspect_data)
self.assertIn(self.mount_dest, inspect_data['Volumes'])
self.assertEqual(
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(
...@@ -298,6 +281,9 @@ class TestCreateContainerWithBinds(BaseTestCase): ...@@ -298,6 +281,9 @@ class TestCreateContainerWithBinds(BaseTestCase):
self.assertIn(self.filename, logs) self.assertIn(self.filename, logs)
inspect_data = self.client.inspect_container(container) inspect_data = self.client.inspect_container(container)
self.check_container_data(inspect_data, False)
def check_container_data(self, inspect_data, rw):
if docker.utils.compare_version('1.20', self.client._version) < 0: if docker.utils.compare_version('1.20', self.client._version) < 0:
self.assertIn('Volumes', inspect_data) self.assertIn('Volumes', inspect_data)
self.assertIn(self.mount_dest, inspect_data['Volumes']) self.assertIn(self.mount_dest, inspect_data['Volumes'])
...@@ -308,14 +294,14 @@ class TestCreateContainerWithBinds(BaseTestCase): ...@@ -308,14 +294,14 @@ class TestCreateContainerWithBinds(BaseTestCase):
self.assertFalse(inspect_data['VolumesRW'][self.mount_dest]) self.assertFalse(inspect_data['VolumesRW'][self.mount_dest])
else: else:
self.assertIn('Mounts', inspect_data) self.assertIn('Mounts', inspect_data)
filtered = filter( filtered = list(filter(
lambda x: x['Destination'] == self.mount_dest, lambda x: x['Destination'] == self.mount_dest,
inspect_data['Mounts'] inspect_data['Mounts']
) ))
self.assertEqual(len(filtered), 1) self.assertEqual(len(filtered), 1)
mount_data = filtered[0] mount_data = filtered[0]
self.assertEqual(mount_data['Source'], self.mount_origin) self.assertEqual(mount_data['Source'], self.mount_origin)
self.assertFalse(mount_data['RW']) self.assertEqual(mount_data['RW'], rw)
@requires_api_version('1.20') @requires_api_version('1.20')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment