Added workaround after getKdumpSize breakage

diff --git a/exec/testcases/xenserver/tc/smoketest.py b/exec/testcases/xenserver/tc/smoketest.py
index 075f1a0cb5e0bfda93dc4e21bc245b4e6d4d5b3e..af06bf34fb7eeefcba4fd506aab7ac0063316f86 100755 (executable)
--- a/exec/testcases/xenserver/tc/smoketest.py
+++ b/exec/testcases/xenserver/tc/smoketest.py
@@ -142,16 +142,17 @@ class _TCSmokeTest(xenrt.TestCase):
         if expected is None:
             return
 
-        guestMemory = self.guest.getGuestMemory()
-        # Take into account any kdump kernel
-        kdumpSize = self.guest.os.getKdumpSize()
-        if kdumpSize:
-            xenrt.TEC().logverbose("Taking into account %uMB of crash kernel" % (kdumpSize / xenrt.MEGA))
-            guestMemory += (kdumpSize / xenrt.MEGA)
-        difference = abs(expected - guestMemory)
-        diffpct = (float(difference) / float(expected)) * 100
-        if diffpct > 4:
-            raise xenrt.XRTFailure("Guest reports %uMB memory, expecting %uMB" % (guestMemory, expected))
+        if not self.guest.windows:
+            guestMemory = self.guest.getGuestMemory()
+            # Take into account any kdump kernel
+            kdumpSize = self.guest.os.getKdumpSize()
+            if kdumpSize:
+                xenrt.TEC().logverbose("Taking into account %uMB of crash kernel" % (kdumpSize / xenrt.MEGA))
+                guestMemory += (kdumpSize / xenrt.MEGA)
+            difference = abs(expected - guestMemory)
+            diffpct = (float(difference) / float(expected)) * 100
+            if diffpct > 4:
+                raise xenrt.XRTFailure("Guest reports %uMB memory, expecting %uMB" % (guestMemory, expected))
 
 
     def setMemory(self):