Skip to content

Commit c7ab647

Browse files
committed
test/integration: don't check for deprecated Networks field
These tests depended on the deprecated Spec.Networks field, which is no longer part of current API versions, causing the test to fail; =================================== FAILURES =================================== _____________ ServiceTest.test_create_service_with_custom_networks _____________ tests/integration/api_service_test.py:379: in test_create_service_with_custom_networks assert 'Networks' in svc_info['Spec'] E AssertionError: assert 'Networks' in {'Labels': {}, 'Mode': {'Replicated': {'Replicas': 1}}, 'Name': 'dockerpytest_a538894175d07404', 'TaskTemplate': {'Con...pec': {'Command': ['true'], 'Image': 'alpine:3.10', 'Isolation': 'default'}, 'ForceUpdate': 0, 'Runtime': 'container'}} ____________ ServiceTest.test_update_service_with_defaults_networks ____________ tests/integration/api_service_test.py:1128: in test_update_service_with_defaults_networks assert 'Networks' in svc_info['Spec'] E AssertionError: assert 'Networks' in {'Labels': {}, 'Mode': {'Replicated': {'Replicas': 1}}, 'Name': 'dockerpytest_6d8e30f359c0f5e', 'TaskTemplate': {'Cont...pec': {'Command': ['true'], 'Image': 'alpine:3.10', 'Isolation': 'default'}, 'ForceUpdate': 0, 'Runtime': 'container'}} _____________ ServiceTest.test_update_service_with_network_change ______________ tests/integration/api_service_test.py:1333: in test_update_service_with_network_change assert 'Networks' in svc_info['Spec'] E AssertionError: assert 'Networks' in {'Labels': {}, 'Mode': {'Replicated': {'Replicas': 1}}, 'Name': 'dockerpytest_d4e23667cdbaf159', 'TaskTemplate': {'Con... {'Command': ['echo', 'hello'], 'Image': 'busybox', 'Isolation': 'default'}, 'ForceUpdate': 0, 'Runtime': 'container'}} ------- generated xml file: /src/bundles/test-docker-py/junit-report.xml ------- =========================== short test summary info ============================ Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 49479ba commit c7ab647

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

tests/integration/api_service_test.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,8 @@ def test_create_service_with_custom_networks(self):
375375
]
376376
)
377377
svc_info = self.client.inspect_service(svc_id)
378-
assert 'Networks' in svc_info['Spec']
379-
assert svc_info['Spec']['Networks'] == [
378+
assert 'Networks' in svc_info['Spec']['TaskTemplate']
379+
assert svc_info['Spec']['TaskTemplate']['Networks'] == [
380380
{'Target': net1['Id']}, {'Target': net2['Id']}
381381
]
382382

@@ -1124,8 +1124,8 @@ def test_update_service_with_defaults_networks(self):
11241124
]
11251125
)
11261126
svc_info = self.client.inspect_service(svc_id)
1127-
assert 'Networks' in svc_info['Spec']
1128-
assert svc_info['Spec']['Networks'] == [
1127+
assert 'Networks' in svc_info['Spec']['TaskTemplate']
1128+
assert svc_info['Spec']['TaskTemplate']['Networks'] == [
11291129
{'Target': net1['Id']}, {'Target': net2['Id']}
11301130
]
11311131

@@ -1329,9 +1329,9 @@ def test_update_service_with_network_change(self):
13291329
task_tmpl, name=name, networks=[net1['Id']]
13301330
)
13311331
svc_info = self.client.inspect_service(svc_id)
1332-
assert 'Networks' in svc_info['Spec']
1333-
assert len(svc_info['Spec']['Networks']) > 0
1334-
assert svc_info['Spec']['Networks'][0]['Target'] == net1['Id']
1332+
assert 'Networks' in svc_info['Spec']['TaskTemplate']
1333+
assert len(svc_info['Spec']['TaskTemplate']['Networks']) > 0
1334+
assert svc_info['Spec']['TaskTemplate']['Networks'][0]['Target'] == net1['Id']
13351335

13361336
svc_info = self.client.inspect_service(svc_id)
13371337
version_index = svc_info['Version']['Index']

0 commit comments

Comments
 (0)