Merge pull request #3652 from aanand/fix-tests-for-1.12

Fix tests to accommodate short-id container alias
This commit is contained in:
Aanand Prasad 2016-06-28 13:27:40 -07:00 committed by GitHub
commit 55e20d1727
1 changed files with 8 additions and 2 deletions

View File

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