From Dan Kenigsberg <[email protected]>: Dan Kenigsberg has uploaded a new change for review.
Change subject: net test: ci is fine, link_bond_test fails on py3 ...................................................................... net test: ci is fine, link_bond_test fails on py3 I mistakenly removed it from the python3 blacklist, and mistakenly marked it as broken on ci. Where in fact it is broken since our netlink subpackage does not support python 3. Change-Id: Ib09f16a602e4314fc72279a1ecc5e0dba657df5d Signed-off-by: Dan Kenigsberg <[email protected]> --- M tests/Makefile.am M tests/network/link_bond_test.py 2 files changed, 1 insertion(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/07/67807/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 502a409..f77c016 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -189,6 +189,7 @@ monkeypatchTests.py \ network/iproute2_test.py \ network/ipwrapper_test.py \ + network/link_bond_test.py \ network/link_iface_test.py \ network/netlink_test.py \ network/netinfo_test.py \ diff --git a/tests/network/link_bond_test.py b/tests/network/link_bond_test.py index 85b145c..e34ec03 100644 --- a/tests/network/link_bond_test.py +++ b/tests/network/link_bond_test.py @@ -28,7 +28,6 @@ from testlib import VdsmTestCase as TestCaseBase, mock from .nettestlib import dummy_devices, check_sysfs_bond_permission -from testValidation import broken_on_ci from vdsm.network.link import iface from vdsm.network.link.bond import Bond @@ -49,19 +48,16 @@ else '../static/usr/share/vdsm/bonding-defaults.json') class LinkBondTests(TestCaseBase): - @broken_on_ci("TODO: provide a reason", exception=ctypes.ArgumentError) def test_bond_without_slaves(self): with bond_device() as bond: self.assertFalse(iface.is_up(bond.master)) - @broken_on_ci("TODO: provide a reason", exception=ctypes.ArgumentError) def test_bond_with_slaves(self): with dummy_devices(2) as (nic1, nic2): with bond_device() as bond: bond.add_slaves((nic1, nic2)) self.assertFalse(iface.is_up(bond.master)) - @broken_on_ci("TODO: provide a reason", exception=ctypes.ArgumentError) def test_bond_devices_are_up(self): with dummy_devices(2) as (nic1, nic2): with bond_device() as bond: @@ -71,7 +67,6 @@ self.assertTrue(iface.is_up(nic2)) self.assertTrue(iface.is_up(bond.master)) - @broken_on_ci("TODO: provide a reason", exception=ctypes.ArgumentError) def test_bond_exists(self): OPTIONS = {'mode': '1', 'miimon': '300'} with dummy_devices(2) as (nic1, nic2): @@ -90,7 +85,6 @@ expected_bond_set = set([b1.master, b2.master, b3.master]) self.assertLessEqual(expected_bond_set, actual_bond_set) - @broken_on_ci("TODO: provide a reason", exception=ctypes.ArgumentError) def test_bond_create_failure_on_slave_add(self): with dummy_devices(2) as (nic1, nic2): with bond_device() as base_bond: @@ -103,7 +97,6 @@ broken_bond.add_slaves((nic1, nic2)) self.assertFalse(Bond(bond_name).exists()) - @broken_on_ci("TODO: provide a reason", exception=ctypes.ArgumentError) def test_bond_edit_failure_on_slave_add(self): with dummy_devices(2) as (nic1, nic2): with bond_device() as base_bond, bond_device() as edit_bond: @@ -117,7 +110,6 @@ self.assertTrue(edit_bond.exists()) self.assertEqual(set((nic2,)), edit_bond.slaves) - @broken_on_ci("TODO: provide a reason", exception=ctypes.ArgumentError) def test_bond_set_options(self): OPTIONS = {'mode': '1', 'miimon': '300'} @@ -130,7 +122,6 @@ _bond = Bond(bond.master) self.assertEqual(_bond.options, OPTIONS) - @broken_on_ci("TODO: provide a reason", exception=ctypes.ArgumentError) def test_bond_edit_options(self): OPTIONS_A = {'mode': '1', 'miimon': '300'} OPTIONS_B = {'mode': '2'} @@ -161,7 +152,6 @@ else '../static/usr/share/vdsm/bonding-defaults.json') class LinkBondSysFSTests(TestCaseBase): - @broken_on_ci("TODO: provide a reason", exception=ctypes.ArgumentError) def test_do_not_detach_slaves_while_changing_options(self): OPTIONS = {'miimon': '110'} -- To view, visit https://gerrit.ovirt.org/67807 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib09f16a602e4314fc72279a1ecc5e0dba657df5d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <[email protected]> _______________________________________________ vdsm-patches mailing list -- [email protected] To unsubscribe send an email to [email protected]
