Skip to content

Commit

Permalink
Fix tests that look at 'Aliases'
Browse files Browse the repository at this point in the history
Inspect output for 'NetworkSettings.Networks.<network>.Aliases'
includes the container's short-id (although it will be removed
in API v1.45, in moby 26.0).

Signed-off-by: Rob Murray <[email protected]>
  • Loading branch information
robmry committed Mar 13, 2024
1 parent bd164f9 commit 3cc898a
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions tests/integration/models_containers_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,12 @@ def test_run_with_networking_config(self):
client.networks.create(net_name)
self.tmp_networks.append(net_name)

test_aliases = ['hello']
test_alias = 'hello'
test_driver_opt = {'key1': 'a'}

networking_config = {
net_name: client.api.create_endpoint_config(
aliases=test_aliases,
aliases=[test_alias],
driver_opt=test_driver_opt
)
}
Expand All @@ -132,8 +132,10 @@ def test_run_with_networking_config(self):
assert 'NetworkSettings' in attrs
assert 'Networks' in attrs['NetworkSettings']
assert list(attrs['NetworkSettings']['Networks'].keys()) == [net_name]
assert attrs['NetworkSettings']['Networks'][net_name]['Aliases'] == \
test_aliases
# Expect Aliases to list 'test_alias' and the container's short-id.
# In API version 1.45, the short-id will be removed.
assert attrs['NetworkSettings']['Networks'][net_name]['Aliases'] \
== [test_alias, attrs['Id'][:12]]
assert attrs['NetworkSettings']['Networks'][net_name]['DriverOpts'] \
== test_driver_opt

Expand Down Expand Up @@ -190,7 +192,9 @@ def test_run_with_networking_config_only_undeclared_network(self):
assert 'NetworkSettings' in attrs
assert 'Networks' in attrs['NetworkSettings']
assert list(attrs['NetworkSettings']['Networks'].keys()) == [net_name]
assert attrs['NetworkSettings']['Networks'][net_name]['Aliases'] is None
# Aliases should include the container's short-id (but it will be removed
# in API v1.45).
assert attrs['NetworkSettings']['Networks'][net_name]['Aliases'] == [attrs["Id"][:12]]
assert (attrs['NetworkSettings']['Networks'][net_name]['DriverOpts']
is None)

Expand Down

0 comments on commit 3cc898a

Please sign in to comment.