Merge pull request #3691 from aanand/fix-alias-tests-on-1.11

Fix alias tests on 1.11
This commit is contained in:
Aanand Prasad 2016-07-06 11:03:54 -07:00 committed by GitHub
commit dcc09b677b
1 changed files with 2 additions and 2 deletions

View File

@ -1164,7 +1164,7 @@ class CLITestCase(DockerClientTestCase):
for _, config in networks.items(): for _, config in networks.items():
# TODO: once we drop support for API <1.24, this can be changed to: # TODO: once we drop support for API <1.24, this can be changed to:
# assert config['Aliases'] == [container.short_id] # assert config['Aliases'] == [container.short_id]
aliases = set(config['Aliases']) - set([container.short_id]) aliases = set(config['Aliases'] or []) - set([container.short_id])
assert not aliases assert not aliases
@v2_only() @v2_only()
@ -1184,7 +1184,7 @@ class CLITestCase(DockerClientTestCase):
for _, config in networks.items(): for _, config in networks.items():
# TODO: once we drop support for API <1.24, this can be changed to: # TODO: once we drop support for API <1.24, this can be changed to:
# assert config['Aliases'] == [container.short_id] # assert config['Aliases'] == [container.short_id]
aliases = set(config['Aliases']) - set([container.short_id]) aliases = set(config['Aliases'] or []) - set([container.short_id])
assert not aliases assert not aliases
assert self.lookup(container, 'app') assert self.lookup(container, 'app')