WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH 10/10][TOOLS][XM-TEST] Fix Memory assumptions in the

To: Xen-Devel <xen-devel@xxxxxxxxxxxxxxxxxxx>
Subject: [Xen-devel] [PATCH 10/10][TOOLS][XM-TEST] Fix Memory assumptions in the create tests
From: Tony Breeds <tony@xxxxxxxxxxxxxxxxxx>
Date: Fri, 20 Oct 2006 13:22:31 +1000
Cc: XenPPC-devel <xen-ppc-devel@xxxxxxxxxxxxxxxxxxx>
Delivery-date: Thu, 19 Oct 2006 21:56:06 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
In-reply-to: <patchbomb.1161308910@xxxxxxxxxxxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Mail-followup-to: Xen-Devel <xen-devel@xxxxxxxxxxxxxxxxxxx>, XenPPC-devel <xen-ppc-devel@xxxxxxxxxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mutt/1.5.9i
Fix Memory assumptions in the create tests.

Use the architecture specified idea of minimum memory.

Signed-off-by: Tony Breeds <tony@xxxxxxxxxxxxxxxxxx>
---

tools/xm-test/tests/create/11_create_concurrent_pos.py        |    2 -
tools/xm-test/tests/create/12_create_concurrent_stress_pos.py |   11 +++++++--
tools/xm-test/tests/create/14_create_blockroot_pos.py         |   11 ++-------
tools/xm-test/tests/create/15_create_smallmem_pos.py          |    4 +--
tools/xm-test/tests/create/16_create_smallmem_neg.py          |   12 +++++-----
5 files changed, 21 insertions(+), 19 deletions(-)

--- a/tools/xm-test/tests/create/11_create_concurrent_pos.py    Thu Oct 19 
17:01:02 2006 +1000
+++ b/tools/xm-test/tests/create/11_create_concurrent_pos.py    Thu Oct 19 
17:02:40 2006 +1000
@@ -16,7 +16,7 @@ else:
     MAX_DOMS = 50
 
 MIN_DOMS    = 5
-MEM_PER_DOM = 24
+MEM_PER_DOM = minSafeMem()
 
 domains = []
 console = []
diff -r 69035d8a5f2a -r 2854ceda351e 
tools/xm-test/tests/create/12_create_concurrent_stress_pos.py
--- a/tools/xm-test/tests/create/12_create_concurrent_stress_pos.py     Thu Oct 
19 17:01:02 2006 +1000
+++ b/tools/xm-test/tests/create/12_create_concurrent_stress_pos.py     Thu Oct 
19 17:02:40 2006 +1000
@@ -8,10 +8,17 @@ import time
 import time
 
 DOMS=5
-MEM=32
+MEM=minSafeMem()
 DUR=60
 
 domains = []
+
+free_mem = int(getInfo("free_memory"))
+NUM_DOMS = int(free_mem / MEM)
+
+if NUM_DOMS < DOMS:
+    SKIP("Need %i MB of RAM to start %i@%iMB domains! (%i MB avail)" %
+         (DOMS * MEM, DOMS, MEM, free_mem))
 
 for i in range(0,DOMS):
     dom = XmTestDomain(extraConfig={"memory" : MEM})
@@ -44,7 +51,7 @@ for d, c in domains:
 
     if verbose:
         print "Testing domain %s..." % d.getName()
-    
+
     run = c.runCmd("ls")
 
     if run["return"] != 0:
diff -r 69035d8a5f2a -r 2854ceda351e 
tools/xm-test/tests/create/14_create_blockroot_pos.py
--- a/tools/xm-test/tests/create/14_create_blockroot_pos.py     Thu Oct 19 
17:01:02 2006 +1000
+++ b/tools/xm-test/tests/create/14_create_blockroot_pos.py     Thu Oct 19 
17:02:40 2006 +1000
@@ -18,17 +18,12 @@ rdpath = getRdPath()
 #     print "Using %s" % output
 
 if ENABLE_HVM_SUPPORT:
-    domain = XmTestDomain(name="14_create_blockroot")
+    config = None
 else:
-    config = {"memory" : "64",
-              "root"   : "/dev/hda1",
-              "name"   : "14_create_blockroot",
-              "kernel" : getDefaultKernel(),
+    config = {"root"   : "/dev/hda1",
               "disk"   : "file:%s/initrd.img,hda1,w" % rdpath
               }
-    domConfig = XenConfig()
-    domConfig.setOpts(config)
-    domain = XenDomain(name=domConfig.getOpt("name"), config=domConfig)
+domain = XmTestDomain(name="14_create_blockroot", extraConfig=config)
 
 try:
     console = domain.start()
diff -r 69035d8a5f2a -r 2854ceda351e 
tools/xm-test/tests/create/15_create_smallmem_pos.py
--- a/tools/xm-test/tests/create/15_create_smallmem_pos.py      Thu Oct 19 
17:01:02 2006 +1000
+++ b/tools/xm-test/tests/create/15_create_smallmem_pos.py      Thu Oct 19 
17:02:40 2006 +1000
@@ -5,8 +5,8 @@
 
 from XmTestLib import *
 
-# 32MBs is the default lower limit for creating domains, it should work
-MEM = 32
+# Create a domain with the minimum memory allocation
+MEM = minSafeMem()
 
 domain = XmTestDomain(extraConfig={"memory": MEM,
                                    "extra" :"mem=%iM" % MEM})
diff -r 69035d8a5f2a -r 2854ceda351e 
tools/xm-test/tests/create/16_create_smallmem_neg.py
--- a/tools/xm-test/tests/create/16_create_smallmem_neg.py      Thu Oct 19 
17:01:02 2006 +1000
+++ b/tools/xm-test/tests/create/16_create_smallmem_neg.py      Thu Oct 19 
17:02:40 2006 +1000
@@ -3,11 +3,11 @@
 # Copyright (C) International Business Machines Corp., 2005
 # Author: Dan Smith <danms@xxxxxxxxxx>
 
+import re
 from XmTestLib import *
 
-# This is under the default lower limit of 32 and we expect this test
-# to fail. 16MBs isn't enough for the -xen kernel.
-MEM = 16
+# Create a domaain without enough memory.
+MEM = minSafeMem() - 1
 
 domain = XmTestDomain(extraConfig={"memory": MEM,
                                    "extra" :"mem=%iM" % MEM})
@@ -16,13 +16,13 @@ try:
     console = domain.start()
     console.runCmd("ls")
 except DomainError, e:
-    FAIL("Unable to start a domain with %i MB" % MEM)
+    if not re.search('^Error: Domain memory must be at least \d+ KB', e.extra):
+        FAIL("Unable to start a domain with %i MB" % MEM)
 except ConsoleError, e:
     if e.reason == RUNAWAY:
         print "Domain with %i MB has runaway console as expected" % MEM
-    else:
-        print "Starting a domain with %i MB failed as expected" % MEM
 else:
     FAIL("Starting a console with %i MB passed, expected test to fail" % MEM)
 
+print "Starting a domain with %i MB failed as expected" % MEM
 domain.destroy()


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