Fixed smoketest postrun

diff --git a/exec/testcases/xenserver/tc/smoketest.py b/exec/testcases/xenserver/tc/smoketest.py
index 5c52882ff663f7eb2573f15c6b10a19176812a9c..c8f8bee912d9759eefbd236dc463c2927b951fd1 100755 (executable)
--- a/exec/testcases/xenserver/tc/smoketest.py
+++ b/exec/testcases/xenserver/tc/smoketest.py
@@ -134,8 +134,7 @@ class _TCSmokeTest(xenrt.TestCase):
             return
 
     def postRun(self):
-        if self.guest and self.guest.getState() != "DOWN":
-            self.guest.shutdown(force=True)
+        self.host.uninstallGuestByName(self.guestName)
 
     def checkGuestMemory(self, expected):
         """Validate the in-guest memory is what we expect (within 4%)"""
@@ -169,8 +168,9 @@ class _TCSmokeTest(xenrt.TestCase):
         if self.ROOTDISK:
             disks = [("0", self.ROOTDISK, False)] 
 
+        self.guestName = xenrt.randomGuestName(self.distro, self.arch)
         self.guest = xenrt.lib.xenserver.guest.createVM(self.host,
-                    xenrt.randomGuestName(self.distro, self.arch),
+                    self.guestName,
                     self.distro,
                     vcpus = self.vcpus,
                     corespersocket = self.cps,
@@ -181,7 +181,6 @@ class _TCSmokeTest(xenrt.TestCase):
                     notools = self.distro.startswith("solaris"),
                     disks=disks)
         
-        self.uninstallOnCleanup(self.guest)
         self.getLogsFrom(self.guest)
         self.guest.check()
 

diff --git a/exec/xenrt/lib/xenserver/host.py b/exec/xenrt/lib/xenserver/host.py
index 364b9d3180b8f79ac974809085b5222b72d6dd31..3b5f18de4e9c4856333b109d43d7b7f4243d8e8e 100755 (executable)
--- a/exec/xenrt/lib/xenserver/host.py
+++ b/exec/xenrt/lib/xenserver/host.py
@@ -635,6 +635,15 @@ class Host(xenrt.GenericHost):
         
         self.installationCookie = "%012x" % xenrt.random.randint(0,0xffffffffffff)
 
+    def uninstallGuestByName(self, name):
+        cli = self.getCLIInstance()
+        try:
+            cli.execute("vm-shutdown", "vm=\"%s\" --force" % name)
+        except Exception, ex:
+            xenrt.TEC().logverbose(str(ex))
+        cli.execute("vm-uninstall", "vm=\"%s\" --force" % name)
+
+    
     def getUptime(self):
         return float(self.execdom0("cat /proc/uptime").split()[0])