Review changes

diff --git a/exec/testcases/benchmarks/workloads.py b/exec/testcases/benchmarks/workloads.py
index 811164e7a2345b1b0b29645069c78cc23895ec57..7d0ca19f6bf7beccbc79969f429b37d41e39fed0 100755 (executable)
--- a/exec/testcases/benchmarks/workloads.py
+++ b/exec/testcases/benchmarks/workloads.py
@@ -63,8 +63,8 @@ class Workload(object):
             data = "@echo off\n%s\n" % (string.replace(self.cmdline,
                                                      "%s",
                                                      self.workdir))
-            if self.guest.xmlrpcFileExists("c:\\~1\\alluse~1\\startm~1\\programs\\startup"):
-                startupPath = "c:\\~1\\alluse~1\\startm~1\\programs\\startup"
+            if self.guest.xmlrpcFileExists("c:\\docume~1\\alluse~1\\startm~1\\programs\\startup"):
+                startupPath = "c:\\docume~1\\alluse~1\\startm~1\\programs\\startup"
             elif self.guest.xmlrpcFileExists("c:\\programData\\microsoft\\windows\\start menu\\programs\\startup"):
                 startupPath = "c:\\programData\\microsoft\\windows\\start menu\\programs\\startup"
             else:

diff --git a/exec/testcases/xenserver/tc/balloon.py b/exec/testcases/xenserver/tc/balloon.py
index d87c2466f8ced9ecc361627b561270bcb3e7bd66..dd213b444b35dba81fe2c567f10bd6e957c6c3c7 100755 (executable)
--- a/exec/testcases/xenserver/tc/balloon.py
+++ b/exec/testcases/xenserver/tc/balloon.py
@@ -282,6 +282,8 @@ class _BalloonSmoketest(_BalloonPerfBase):
         # If it's shutdown, start it so we try and collect logs
         if self.guest and self.guest.getState() == "DOWN":
             xenrt.TEC().logverbose("Attempting to start guest for log collection")
+            val = max(self.minSupported, 1024)
+            self.guest.setMemoryProperties(None, val, val, val)
             try:
                 self.guest.start()
             except:
@@ -423,21 +425,16 @@ class _BalloonSmoketest(_BalloonPerfBase):
             #(ranging from too busy, crashed guest, malicious guest, buggy balloon driver)
             #then the product marks the guest as uncooperative
             #Check for uncooperative tag, if found shut down the VM, print the details and proceed with the test
-            elif "Target not reached within timeout" in str(e):
-                res = self.host.execdom0("xenstore-ls -pf | grep memory | grep -E 'uncoop'")
-                if res and "uncooperative" in res:
-                    log("Caught failure: %s" % str(e))
-                    log("Guest marked uncooperative")
-                    log("Shut down the guest")
-                    try:
-                        self.guest.shutdown(force=True)
-                    except:
-                        pass
-                    raise
-                else:
-                    raise
-            else:
-                raise
+            res = self.host.execdom0("xenstore-ls -pf | grep memory | grep -E 'uncoop'")
+            if res and "uncooperative" in res:
+                log("Caught failure: %s" % str(e))
+                log("Guest marked uncooperative")
+                log("Shut down the guest")
+                try:
+                    self.guest.shutdown(force=True)
+                except:
+                    pass
+            raise
 
     def testMaxRange(self, minMem, maxMem):
         step("Set dynamic-min=dynamic-max=min, static-max=max")