[Xen-devel] [PATCH][XM-TEST] Fix test 04_memset_smallmem

[Dan Smith <danms@xxxxxxxxxx>]

This patch fixes test 04_memset_smallmem so that it correctly
differentiates between a simple console run-away and the actual
console daemon dying because of the run-away.  Also bump the console
run-away limit to 64k.

Signed-off-by: Dan Smith <danms@xxxxxxxxxx>

# HG changeset patch
# User dan@xxxxxxxxxxxxxxxxxxxxxxxxxxx
# Node ID 0183df7ad09e6e400499d91b3c667b84f16df83f
# Parent  13b2e5c945956657aa330a6182f204c46ba626af
Make 04_memset_smallmem differentiate between console run-away and console
daemon death.

diff -r 13b2e5c94595 -r 0183df7ad09e tools/xm-test/lib/XmTestLib/Test.py
--- a/tools/xm-test/lib/XmTestLib/Test.py       Tue Nov 22 11:04:03 2005
+++ b/tools/xm-test/lib/XmTestLib/Test.py       Tue Nov 22 18:56:30 2005
@@ -161,6 +161,29 @@
     print "*** Test %s started at %s %s" % (name, t,
                                             time.tzname[time.daylight])
 
+#
+# Try to start a domain and attach a console to it to see if
+# the console system is working
+#
+def isConsoleDead():
+
+    from XmTestLib import XmTestDomain, DomainError, XmConsole, ConsoleError
+
+    domain = XmTestDomain()
+
+    try:
+        domain.start()
+        console = XmConsole(domain.getName())
+    except DomainError, e:
+        return True
+    except ConsoleError, e:
+        return True
+
+    domain.destroy()
+
+    return False
+    
+
 if __name__ == "__main__":
 
     timeStamp()
diff -r 13b2e5c94595 -r 0183df7ad09e 
tools/xm-test/tests/memset/04_memset_smallmem_pos.py
--- a/tools/xm-test/tests/memset/04_memset_smallmem_pos.py      Tue Nov 22 
11:04:03 2005
+++ b/tools/xm-test/tests/memset/04_memset_smallmem_pos.py      Tue Nov 22 
18:56:30 2005
@@ -30,7 +30,7 @@
     FAIL("xm mem-set %s %i returned invalid %i != 0" %
          (domain.getName(), domain.minSafeMem(), status))
 
-console.setLimit(8192)
+console.setLimit(65536)
 
 try:
     # See if this hits the byte limit
@@ -39,13 +39,15 @@
     if e.reason == RUNAWAY:
         # Need to stop the domain before we restart the console daemon
         domain.destroy()
-        if verbose:
+        if isConsoleDead():
             print "*** Attempting restart of xenconsoled"
             s, o = traceCommand("killall xenconsoled")
             s, o = traceCommand("xenconsoled")
             if s != 0:
                 print "*** Starting xenconsoled failed: %i" % s
-        FAIL("Bug #380: I crashed the console system")
+            FAIL("Bug #380: I crashed the console system")
+        else:
+            FAIL("Bug #145: Ballooning DomU too low caused run-away")
     else:
         FAIL(str(e))
 

-- 
Dan Smith
IBM Linux Technology Center
Open Hypervisor Team
email: danms@xxxxxxxxxx

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel