This patch fixes a few tests, in the following ways:
1. Unmark the 07 and 08 tests of block_attach as XFAIL
2. Change the MEM_PER_DOM amount in 11_create_concurrent to 24MB, so
that the test will run on x86_64.
3. Increase the number of DomUs created in 12_create_concurrent to 5
4. Fix a logic error in 01_unpause
5. Add a test 06_help that checks all xm commands with 0-10 arguments
to make sure none of them traceback with varying argument counts.
Signed-off-by: Dan Smith <danms@xxxxxxxxxx>
diff -r a05e55c919c1 tools/xm-test/tests/block-create/Makefile.am
--- a/tools/xm-test/tests/block-create/Makefile.am Mon Nov 7 14:06:27 2005
+++ b/tools/xm-test/tests/block-create/Makefile.am Mon Nov 7 10:28:32 2005
@@ -11,10 +11,6 @@
09_block_attach_and_dettach_device_check_data_pos.test
DISABLED =
-
-XFAIL_TESTS = 07_block_attach_baddevice_neg.test \
- 08_block_attach_bad_filedevice_neg.test
-
EXTRA_DIST = $(TESTS) $(XFAIL_TESTS)
diff -r a05e55c919c1 tools/xm-test/tests/create/11_create_concurrent_pos.py
--- a/tools/xm-test/tests/create/11_create_concurrent_pos.py Mon Nov 7
14:06:27 2005
+++ b/tools/xm-test/tests/create/11_create_concurrent_pos.py Mon Nov 7
10:28:32 2005
@@ -10,7 +10,7 @@
MIN_DOMS = 10
MAX_DOMS = 50
-MEM_PER_DOM = 16
+MEM_PER_DOM = 24
domains = []
console = []
diff -r a05e55c919c1
tools/xm-test/tests/create/12_create_concurrent_stress_pos.py
--- a/tools/xm-test/tests/create/12_create_concurrent_stress_pos.py Mon Nov
7 14:06:27 2005
+++ b/tools/xm-test/tests/create/12_create_concurrent_stress_pos.py Mon Nov
7 10:28:32 2005
@@ -7,7 +7,7 @@
import time
-DOMS=2
+DOMS=5
MEM=32
DUR=60
diff -r a05e55c919c1 tools/xm-test/tests/help/Makefile.am
--- a/tools/xm-test/tests/help/Makefile.am Mon Nov 7 14:06:27 2005
+++ b/tools/xm-test/tests/help/Makefile.am Mon Nov 7 10:28:32 2005
@@ -4,7 +4,8 @@
02_help_basic_neg.test \
03_help_badparm_neg.test \
04_help_long_pos.test \
- 05_help_nonroot_pos.test
+ 05_help_nonroot_pos.test \
+ 06_help_allcmds.test
XFAIL_TESTS =
diff -r a05e55c919c1 tools/xm-test/tests/list/06_list_nonroot.py
--- a/tools/xm-test/tests/list/06_list_nonroot.py Mon Nov 7 14:06:27 2005
+++ b/tools/xm-test/tests/list/06_list_nonroot.py Mon Nov 7 10:28:32 2005
@@ -2,7 +2,6 @@
# Copyright (C) International Business Machines Corp., 2005
# Copyright (C) XenSource Ltd, 2005
-# Author: Woody Marvel <marvel@xxxxxxxxxx>
# Author: Ewan Mellor <ewan@xxxxxxxxxxxxx>
from XmTestLib import *
diff -r a05e55c919c1 tools/xm-test/tests/memset/Makefile.am
--- a/tools/xm-test/tests/memset/Makefile.am Mon Nov 7 14:06:27 2005
+++ b/tools/xm-test/tests/memset/Makefile.am Mon Nov 7 10:28:32 2005
@@ -2,8 +2,8 @@
TESTS = 01_memset_basic_pos.test \
02_memset_badparm_neg.test \
- 04_memset_smallmem_pos.test \
- 03_memset_random_pos.test
+ 03_memset_random_pos.test \
+ 04_memset_smallmem_pos.test
XFAIL_TESTS =
diff -r a05e55c919c1 tools/xm-test/tests/unpause/01_unpause_basic_pos.py
--- a/tools/xm-test/tests/unpause/01_unpause_basic_pos.py Mon Nov 7
14:06:27 2005
+++ b/tools/xm-test/tests/unpause/01_unpause_basic_pos.py Mon Nov 7
10:28:32 2005
@@ -74,14 +74,15 @@
FAIL(str(e))
try:
run = console.runCmd("ls")
- #If we get here, console attached to paused domain (unexpected)
- FAIL("console attached to supposedly paused domain")
except ConsoleError, e:
pass
# Close the console
console.closeConsole()
+if run["return"] != 0:
+ FAIL("console failed to attach to supposedly unpaused domain")
+
# Stop the domain (nice shutdown)
domain.stop()
diff -r a05e55c919c1 tools/xm-test/tests/help/06_help_allcmds.py
--- /dev/null Mon Nov 7 14:06:27 2005
+++ b/tools/xm-test/tests/help/06_help_allcmds.py Mon Nov 7 10:28:32 2005
@@ -0,0 +1,44 @@
+#!/usr/bin/python
+
+# Copyright (C) International Business Machines Corp., 2005
+# Author: Dan Smith <danms@xxxxxxxxxx>
+
+from XmTestLib import *
+
+import re
+
+MAX_ARGS = 10
+
+# These commands aren't suitable for this test, so we
+# ignore them
+skipcommands = ["top", "log"]
+
+status, output = traceCommand("xm help --long")
+
+commands = []
+badcommands = []
+
+lines = output.split("\n")
+for l in lines:
+ match = re.match("^ ([a-z][^ ]+).*$", l)
+ if match:
+ commands.append(match.group(1))
+
+for c in commands:
+ if c in skipcommands:
+ continue
+
+ arglist = ""
+ for i in range(0,MAX_ARGS+1):
+ if i > 0:
+ arglist += "%i " % i
+
+ status, output = traceCommand("xm %s %s" % (c, arglist))
+
+ if output.find("Traceback") != -1:
+ badcommands.append(c + " " + arglist)
+ if verbose:
+ print "Got Traceback: %s %s" % (c, arglist)
+
+if badcommands:
+ FAIL("Got a traceback on: %s" % str(badcommands))
--
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
|
Home