Ido Barkan has uploaded a new change for review. Change subject: net: fix python 2.7 specific code ......................................................................
net: fix python 2.7 specific code This syntax is only supported in python 2.7 hence should be removed from 3.5 branch which also supports el6's python 2.6.6. Label: ovirt-3.5-only Change-Id: Ic51448702d567c8926149232db14e2d689c29880 Signed-off-by: Ido Barkan <ibar...@redhat.com> Bug-Url: https://bugzilla.redhat.com/1203422 --- M tests/functional/networkTests.py M tests/functional/utils.py 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/12/43512/1 diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index b17ce17..c29ff01 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -1686,10 +1686,10 @@ self.assertEquals(status, SUCCESS, msg) _assert_all_nets_exist() # verify that the running config now has all desired networks - self.assertEqual({NET_MGMT, NET_CHANGED, NET_UNCHANGED, - NET_ADDITIONAL}, + self.assertEqual(set([NET_MGMT, NET_CHANGED, NET_UNCHANGED, + NET_ADDITIONAL]), set(self.vdsm_net.config.networks.keys())) - self.assertEqual({BOND_CHANGED, BOND_UNCHANGED}, + self.assertEqual(set([BOND_CHANGED, BOND_UNCHANGED]), set(self.vdsm_net.config.bonds.keys())) finally: diff --git a/tests/functional/utils.py b/tests/functional/utils.py index 618b272..7d82f8a 100644 --- a/tests/functional/utils.py +++ b/tests/functional/utils.py @@ -156,7 +156,7 @@ stack = inspect.stack() # add calling method for logs test_method, code_line = stack[3][3], stack[3][2] - options['_caller'] = '{}:{}'.format(test_method, code_line) + options['_caller'] = '%s:%s'.format(test_method, code_line) result = self.vdscli.setupNetworks(networks, bonds, options) return result['status']['code'], result['status']['message'] -- To view, visit https://gerrit.ovirt.org/43512 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic51448702d567c8926149232db14e2d689c29880 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ido Barkan <ibar...@redhat.com> _______________________________________________ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
