Change in vdsm[master]: Storage Domain V3 Functional Tests

Zhou Zheng Sheng has uploaded a new change for review.

Change subject: Storage Domain V3 Functional Tests
......................................................................

Storage Domain V3 Functional Tests

The functional tests are for storage domain v1, change it to test
storage domain v3. Getting host id lease from sanlock takes some time,
so the patch increases the waiting time before timeout.

Change-Id: Iaf9d918b5ef68eaf75c328a1368d1b8d5198f023
Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com&gt;
---
M tests/functional/xmlrpcTests.py
1 file changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/29/14829/1

diff --git a/tests/functional/xmlrpcTests.py b/tests/functional/xmlrpcTests.py
index bcd63f2..117d486 100644
--- a/tests/functional/xmlrpcTests.py
+++ b/tests/functional/xmlrpcTests.py
@@ -52,7 +52,10 @@
     raise SkipTest("XML-RPC Bindings are disabled")
 
 _mkinitrd = CommandPath("mkinird", "/usr/bin/mkinitrd")
-_modprobe = CommandPath("modprobe", "/usr/sbin/modprobe")
+_modprobe = CommandPath("modprobe",
+                        "/usr/sbin/modprobe",  # Fedora, Ubuntu
+                        "/sbin/modprobe",  # RHEL6
+                        )
 _exportfs = CommandPath("exportfs", "/usr/sbin/exportfs")
 
 
@@ -272,7 +275,7 @@
 
             r = self.s.createStorageDomain(
                 storage.sd.name2type(domain['type']), sdid,
domain['name'],
-                specificArg, storage.sd.name2class(domain['class']), 0)
+                specificArg, storage.sd.name2class(domain['class']), 3)
             self.assertVdsOK(r)
             undo = lambda sdid=sdid: \
                 self.assertVdsOK(self.s.formatStorageDomain(sdid, True))
@@ -363,7 +366,7 @@
             state = r['taskStatus']['taskState']
             self.assertEquals(state, 'finished')
 
-        self.retryAssert(assertTaskOK, timeout=20)
+        self.retryAssert(assertTaskOK, timeout=60)
 
 
 class BackendServer(object):


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf9d918b5ef68eaf75c328a1368d1b8d5198f023
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com&gt;