Skip to content

Support API version 1.20 #765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 23, 2015
Merged

Support API version 1.20 #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6a86e1
Fix volumes tests for API version >= 1.20
shin- Sep 12, 2015
da2b797
Improve volume bindings integration test
shin- Sep 22, 2015
48d72f6
Bump default API version
shin- Sep 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DEFAULT_DOCKER_API_VERSION = '1.19'
DEFAULT_DOCKER_API_VERSION = '1.20'
DEFAULT_TIMEOUT_SECONDS = 60
STREAM_HEADER_SIZE_BYTES = 8
CONTAINER_LIMITS_KEYS = [
Expand Down
36 changes: 23 additions & 13 deletions tests/integration_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,14 +264,8 @@ def test_rw(self):
if six.PY3:
logs = logs.decode('utf-8')
self.assertIn(self.filename, logs)

# FIXME: format changes in API version >= 1.20
inspect_data = self.client.inspect_container(container)
self.assertEqual(
self.mount_origin,
inspect_data['Volumes'][self.mount_dest]
)
self.assertTrue(inspect_data['VolumesRW'][self.mount_dest])
self.check_container_data(inspect_data, True)

def test_ro(self):
container = self.run_with_volume(
Expand All @@ -285,13 +279,28 @@ def test_ro(self):
logs = logs.decode('utf-8')
self.assertIn(self.filename, logs)

# FIXME: format changes in API version >= 1.20
inspect_data = self.client.inspect_container(container)
self.assertEqual(
self.mount_origin,
inspect_data['Volumes'][self.mount_dest]
)
self.assertFalse(inspect_data['VolumesRW'][self.mount_dest])
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:
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.assertFalse(inspect_data['VolumesRW'][self.mount_dest])
else:
self.assertIn('Mounts', inspect_data)
filtered = list(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.assertEqual(mount_data['RW'], rw)


@requires_api_version('1.20')
Expand Down Expand Up @@ -325,6 +334,7 @@ def test_group_id_strings(self):
logs = self.client.logs(container)
if six.PY3:
logs = logs.decode('utf-8')

groups = logs.strip().split(' ')
self.assertIn('1000', groups)
self.assertIn('1001', groups)
Expand Down