Zhou Zheng Sheng has uploaded a new change for review.

Change subject: xmlrpcTests: narrow the expected exception when using retry
......................................................................

xmlrpcTests: narrow the expected exception when using retry

Change the expected exception from the default Exception to
AssertionError

Change-Id: I0deded14d02a21bcfbca49dbdfadfe8652added3
Signed-off-by: Zhou Zheng Sheng <[email protected]>
---
M tests/functional/xmlrpcTests.py
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/44/8444/1

diff --git a/tests/functional/xmlrpcTests.py b/tests/functional/xmlrpcTests.py
index 6ccaf66..1d44059 100644
--- a/tests/functional/xmlrpcTests.py
+++ b/tests/functional/xmlrpcTests.py
@@ -122,7 +122,8 @@
                            'vmName': 'foo'})
         self.assertVdsOK(r)
         try:
-            retry(lambda: self.assertVmUp(VMID), timeout=20)
+            retry(lambda: self.assertVmUp(VMID),
+                  expectedException=AssertionError, timeout=20)
         finally:
             # FIXME: if the server dies now, we end up with a leaked VM.
             r = self.s.destroy(VMID)
@@ -154,7 +155,8 @@
             try:
                 self.assertVdsOK(self.s.create(conf))
                 # wait 65 seconds for VM to come up until timeout
-                retry(assertVMAndGuestUp, timeout=65)
+                retry(assertVMAndGuestUp, expectedException=AssertionError,
+                      timeout=65)
             finally:
                 destroyResult = self.s.destroy(VMID)
 


--
To view, visit http://gerrit.ovirt.org/8444
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0deded14d02a21bcfbca49dbdfadfe8652added3
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Zhou Zheng Sheng <[email protected]>
_______________________________________________
vdsm-patches mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Reply via email to