Xen-test-framework: removing blocker from tests to make them

independent of each other.

diff --git a/exec/testcases/xenserver/tc/ring0/ring0xen.py b/exec/testcases/xenserver/tc/ring0/ring0xen.py
index 7d4ef2008bed8594cf2cb2de542d3e30b2a2e2e9..bb64ad0b51ba5178a4a54508ba9edd99ec289525 100644 (file)
--- a/exec/testcases/xenserver/tc/ring0/ring0xen.py
+++ b/exec/testcases/xenserver/tc/ring0/ring0xen.py
@@ -22,6 +22,7 @@ class XenTestRun(object):
 
     def run(self):
         self.host.execdom0("xl create /opt/xen-test-framework/%s.cfg" % self.name)
+        time.sleep(10)
         self.results()
 
 class TCRing0XenBase(xenrt.TestCase):
@@ -46,11 +47,6 @@ class TCRing0XenBase(xenrt.TestCase):
 
         self.host.execdom0("rpm --force -Uvh %s" % (modulePath))
 
-        consoleCfg = xenrt.TEC().getFile("/etc/sysconfig/xencommons")
-        try:
-            xenrt.checkFileExists(consoleCfg)
-        except xenrt.XRTException, e:
-            raise xenrt.XRTError(e.reason)
         self.host.execdom0("sed -i 's/#XENSTORED_TRACE.*/XENSTORED_TRACE=yes/' /etc/sysconfig/xencommons")
         self.host.execdom0("sed -i 's/#XENCONSOLED_TRACE.*/XENCONSOLED_TRACE=all/' /etc/sysconfig/xencommons")
         self.host.execdom0("/bin/systemctl restart xenconsoled.service")
@@ -60,25 +56,21 @@ class TCRing0XenPV32Test(TCRing0XenBase):
         step("32bit PV test")
         xenPV32Test = XenTestRun(self.host, "test-pv32-example");
         xenPV32Test.run()
-        time.sleep(10)
 
 class TCRing0XenPV64Test(TCRing0XenBase):
     def run(self, arglist):
         step("64bit PV Test")
         xenPV64Test = XenTestRun(self.host, "test-pv64-example");
         xenPV64Test.run()
-        time.sleep(10)
 
 class TCRing0XenHVM32Test(TCRing0XenBase):
     def run(self, arglist):
         step("32bit HVM test")
         xenHvm32Test = XenTestRun(self.host, "test-hvm32-example");
         xenHvm32Test.run()
-        time.sleep(10)
 
 class TCRing0XenHVM64Test(TCRing0XenBase):
     def run(self, arglist):
         step("64bit HVM test")
         xenHvm64Test = XenTestRun(self.host, "test-hvm64-example");
         xenHvm64Test.run()
-        time.sleep(10)

diff --git a/seqs/ring0/ring0xen.seq b/seqs/ring0/ring0xen.seq
index b525aaa1900d456023957f543b2e63bf8bb4930b..d1bfc9bd2fce1818bae8153e5badd26ee3c6e94e 100644 (file)
--- a/seqs/ring0/ring0xen.seq
+++ b/seqs/ring0/ring0xen.seq
@@ -7,10 +7,10 @@
   </prepare>
 
   <testsequence group="XenTestFramework">
-      <testcase id="xenserver.tc.ring0.ring0xen.TCRing0XenPV32Test" blocker="yes"/>
-      <testcase id="xenserver.tc.ring0.ring0xen.TCRing0XenPV64Test" blocker="yes"/>
-      <testcase id="xenserver.tc.ring0.ring0xen.TCRing0XenHVM32Test" blocker="yes"/>
-      <testcase id="xenserver.tc.ring0.ring0xen.TCRing0XenHVM64Test" blocker="yes"/>
+      <testcase id="xenserver.tc.ring0.ring0xen.TCRing0XenPV32Test/>
+      <testcase id="xenserver.tc.ring0.ring0xen.TCRing0XenPV64Test/>
+      <testcase id="xenserver.tc.ring0.ring0xen.TCRing0XenHVM32Test/>
+      <testcase id="xenserver.tc.ring0.ring0xen.TCRing0XenHVM64Test/>
   </testsequence>
 
 </xenrt>