Change in vdsm[master]: tests: Remove hack for devices with same names

nsoffer at redhat.com nsoffer at redhat.com
Wed Jul 29 19:30:20 UTC 2015


Nir Soffer has uploaded a new change for review.

Change subject: tests: Remove hack for devices with same names
......................................................................

tests: Remove hack for devices with same names

After the test isolation issues in tcTests.py and ipwrapperTests.py were
resolved, we are not expecting setup to fail because a device with same
name exists, so we can remove the hack that used to skip tests.

It is possible that slaves contains stale devices from previous run of
the broken tests, but this should be solved by cleaning the slaves, not
by hiding the error and skipping tests.

Change-Id: I675e57756859ca7ffe272607b7f528c281c65256
Signed-off-by: Nir Soffer <nsoffer at redhat.com>
---
M tests/tcTests.py
1 file changed, 1 insertion(+), 11 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/66/44166/1

diff --git a/tests/tcTests.py b/tests/tcTests.py
index dbbac95..942f63f 100644
--- a/tests/tcTests.py
+++ b/tests/tcTests.py
@@ -87,17 +87,7 @@
 class _Bridge(_Interface):
 
     def addDevice(self):
-        try:
-            check_call([EXT_BRCTL, 'addbr', self.devName])
-        except ExecError as e:
-            # FIXME: we do not know why we sometime see the same bridge names
-            # on jenkins slaves. This is an ugly hack to mitigate the issue,
-            # since it is certainly not the fault of the test case
-            if "can't create bridge with the same name" in e.err:
-                raise SkipTest(e.err)
-            else:
-                raise
-
+        check_call([EXT_BRCTL, 'addbr', self.devName])
         # learning interval is different on different kernels, so set it
         # explicit for 2.x kernels
         if os.uname()[2].startswith("2"):


-- 
To view, visit https://gerrit.ovirt.org/44166
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I675e57756859ca7ffe272607b7f528c281c65256
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer at redhat.com>


More information about the vdsm-patches mailing list