Change in vdsm[master]: tests: 'ip link del dev <bridge>' fails on rhel6 if the brid...
ibarkan at redhat.com
ibarkan at redhat.com
Mon Feb 2 10:00:12 UTC 2015
Ido Barkan has uploaded a new change for review.
Change subject: tests: 'ip link del dev <bridge>' fails on rhel6 if the bridge device is still up.
......................................................................
tests: 'ip link del dev <bridge>' fails on rhel6 if the bridge device is still up.
Change-Id: I3e4921ee64cb36fef1a0658a991aa95b09e117cb
Signed-off-by: Ido Barkan <ibarkan at redhat.com>
---
M tests/functional/networkTests.py
1 file changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/42/37442/1
diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 46ec4d8..a7a223c 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -1929,7 +1929,17 @@
self.assertEqual(status, SUCCESS, msg)
self.assertNetworkExists(NETWORK_NAME)
device_to_remove = NETWORK_NAME if bridged else nic + '.' + VLAN_ID
- ipwrapper.linkDel(device_to_remove)
+ try:
+ ipwrapper.linkDel(device_to_remove)
+ except ipwrapper.IPRoute2Error:
+ if bridged and _system_is_el6():
+ execCmd([EXT_IFDOWN, NETWORK_NAME])
+ rc, _, err = execCmd([EXT_BRCTL, 'delbr', NETWORK_NAME])
+ if rc != 0:
+ raise self.failureException("failed to delete bridge"
+ "err:%s", err)
+ else:
+ raise
self.vdsm_net.refreshNetinfo()
self.assertNotIn(NETWORK_NAME, self.vdsm_net.netinfo.networks)
status, msg = self.vdsm_net.setupNetworks(network, {},
--
To view, visit http://gerrit.ovirt.org/37442
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e4921ee64cb36fef1a0658a991aa95b09e117cb
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan at redhat.com>
More information about the vdsm-patches
mailing list