6:40 a.m.
Dan Kenigsberg has uploaded a new change for review.
Change subject: py3: make ovs_test pass
......................................................................
py3: make ovs_test pass
Change-Id: Id812fb7c37573ed68dd4be9f982b8ae892532c9c
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M tests/Makefile.am
M tests/network/ovs_test.py
2 files changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/99/65599/1
diff --git a/tests/Makefile.am b/tests/Makefile.am
index be213c0..e96f226 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -195,7 +195,6 @@
network/netinfo_test.py \
network/ovs_driver_test.py \
network/ovs_info_test.py \
- network/ovs_test.py \
network/tc_test.py \
network/unified_persistence_test.py \
numaUtilsTests.py \
diff --git a/tests/network/ovs_test.py b/tests/network/ovs_test.py
index 000811d..96eaf85 100644
--- a/tests/network/ovs_test.py
+++ b/tests/network/ovs_test.py
@@ -68,7 +68,7 @@
ovs_validator.validate_net_configuration(
'net1', {'nic': 'eth0', 'switch':
'ovs'},
fake_to_be_added_bonds, fake_running_bonds, fake_kernel_nics)
- self.assertEquals(e.exception[0], ne.ERR_BAD_NIC)
+ self.assertEquals(e.exception.args[0], ne.ERR_BAD_NIC)
def test_add_network_with_non_existing_bond(self):
fake_running_bonds = {}
@@ -78,7 +78,7 @@
ovs_validator.validate_net_configuration(
'net1', {'bonding': 'bond1', 'switch':
'ovs'},
fake_to_be_added_bonds, fake_running_bonds, fake_kernel_nics)
- self.assertEquals(e.exception[0], ne.ERR_BAD_BONDING)
+ self.assertEquals(e.exception.args[0], ne.ERR_BAD_BONDING)
def test_add_network_with_to_be_added_bond(self):
fake_running_bonds = {}
@@ -169,7 +169,7 @@
ovs_validator.validate_bond_configuration(
'bond1', {'remove': True}, nets, running_nets,
fake_kernel_nics)
- self.assertEquals(e.exception[0], ne.ERR_USED_BOND)
+ self.assertEquals(e.exception.args[0], ne.ERR_USED_BOND)
def test_remove_bond_attached_to_network_that_will_use_nic(self):
fake_kernel_nics = ['eth0', 'eth1']
@@ -188,7 +188,7 @@
ovs_validator.validate_bond_configuration(
'bond1', {'remove': True}, nets, running_nets,
fake_kernel_nics)
- self.assertEquals(e.exception[0], ne.ERR_USED_BOND)
+ self.assertEquals(e.exception.args[0], ne.ERR_USED_BOND)
class MockedOvsInfo(ovs_info.OvsInfo):
--
To view, visit https://gerrit.ovirt.org/65599
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id812fb7c37573ed68dd4be9f982b8ae892532c9c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6:41 a.m.
gerrit-hooks has posted comments on this change.
Change subject: py3: make ovs_test pass
......................................................................
Patch Set 1:
* Update Tracker::IGNORE, no bug url/s found
* Check Bug-Url::IGNORE, not relevant for branch: master
* Check Public Bug::WARN, no public bug url found
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6',
'ovirt-4.0'])
--
To view, visit https://gerrit.ovirt.org/65599
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Id812fb7c37573ed68dd4be9f982b8ae892532c9c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
1:59 p.m.
Dan Kenigsberg has posted comments on this change.
Change subject: py3: make ovs_test pass
......................................................................
Patch Set 1: Verified+1
passes in Jenkins under both py2 and py3
--
To view, visit https://gerrit.ovirt.org/65599
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Id812fb7c37573ed68dd4be9f982b8ae892532c9c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
5:04 p.m.
Petr Horáček has posted comments on this change.
Change subject: py3: make ovs_test pass
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.ovirt.org/65599
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Id812fb7c37573ed68dd4be9f982b8ae892532c9c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6:15 a.m.
Dan Kenigsberg has posted comments on this change.
Change subject: py3: make ovs_test pass
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.ovirt.org/65599
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Id812fb7c37573ed68dd4be9f982b8ae892532c9c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6:15 a.m.
Dan Kenigsberg has submitted this change and it was merged.
Change subject: py3: make ovs_test pass
......................................................................
py3: make ovs_test pass
Change-Id: Id812fb7c37573ed68dd4be9f982b8ae892532c9c
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
Reviewed-on: https://gerrit.ovirt.org/65599
Continuous-Integration: Jenkins CI
Reviewed-by: Petr Horáček <phoracek(a)redhat.com>
---
M tests/Makefile.am
M tests/network/ovs_test.py
2 files changed, 4 insertions(+), 5 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Petr Horáček: Looks good to me, but someone else must approve
Dan Kenigsberg: Verified; Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/65599
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id812fb7c37573ed68dd4be9f982b8ae892532c9c
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
6:15 a.m.
gerrit-hooks has posted comments on this change.
Change subject: py3: make ovs_test pass
......................................................................
Patch Set 2:
* Update Tracker::IGNORE, no bug url/s found
* Set MODIFIED::IGNORE, no Bug-Url found.
--
To view, visit https://gerrit.ovirt.org/65599
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Id812fb7c37573ed68dd4be9f982b8ae892532c9c
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
2744
days inactive
2746
days old
vdsm-patches@lists.fedorahosted.org
6 comments
3 participants
participants (3)
-
automation＠ovirt.org -
Dan Kenigsberg -
phoracek＠redhat.com