# HG changeset patch
# User dan@xxxxxxxxxxxxxxxxxxxxxxxxxxx
# Node ID bd250c4a86cb38428852dcf0410774bd79a300a1
# Parent 989896f3bc456f0ea5acc0c6fa6263a8953797ba
Some tweaks to the restore and migrate tests to expose the consoles of the
restored DomUs, since they currently Oops on x86_64.
diff -r 989896f3bc45 -r bd250c4a86cb
tools/xm-test/tests/migrate/01_migrate_localhost_pos.py
--- a/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py Wed Nov 30
11:42:07 2005
+++ b/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py Wed Nov 30
11:44:19 2005
@@ -38,8 +38,8 @@
try:
# Activate the console
console.sendInput("foo")
- # Make sure a command succeeds
- run = console.runCmd("ls /bin")
+ # Set a variable to check on the other side
+ run = console.runCmd("foo=bar")
except ConsoleError, e:
FAIL(str(e))
@@ -66,18 +66,21 @@
# Attach a console to it
try:
console = XmConsole(domain.getName(), historySaveCmds=True)
+ console.debugMe = True
except ConsoleError, e:
pass
+
+console.sendInput("ls")
# Run 'ls'
try:
# Check the dmesg output on the domU
- run = console.runCmd("ls /bin")
+ run = console.runCmd("echo xx$foo")
except ConsoleError, e:
FAIL(str(e))
-
-if not re.search("chmod", run["output"]):
- FAIL("invalid console output from ls after migration")
+
+if not re.search("bar", run["output"]):
+ FAIL("Migrated domain has been reset")
# Close the console
console.closeConsole()
diff -r 989896f3bc45 -r bd250c4a86cb
tools/xm-test/tests/restore/01_restore_basic_pos.py
--- a/tools/xm-test/tests/restore/01_restore_basic_pos.py Wed Nov 30
11:42:07 2005
+++ b/tools/xm-test/tests/restore/01_restore_basic_pos.py Wed Nov 30
11:44:19 2005
@@ -25,6 +25,8 @@
# Make sure the domain isn't DOA
try:
console = XmConsole(domain.getName())
+ console.sendInput("input")
+ console.runCmd("foo=bar")
except ConsoleError, e:
FAIL(str(e))
@@ -63,9 +65,12 @@
# Make sure it's alive
try:
newConsole = XmConsole(domain.getName())
- run = newConsole.runCmd("ls")
- if run["return"] != 0:
- FAIL("Unable to read from restored domain")
+ # Enable debug dumping because this generates a Oops on x86_64
+ newConsole.debugMe = True
+ newConsole.sendInput("ls")
+ run = newConsole.runCmd("echo xx$foo")
+ if not re.search("bar", run["output"]):
+ FAIL("Restored domain has been reset")
except ConsoleError, e:
FAIL("Restored domain is dead (%s)" % str(e))
diff -r 989896f3bc45 -r bd250c4a86cb
tools/xm-test/tests/restore/04_restore_withdevices_pos.py
--- a/tools/xm-test/tests/restore/04_restore_withdevices_pos.py Wed Nov 30
11:42:07 2005
+++ b/tools/xm-test/tests/restore/04_restore_withdevices_pos.py Wed Nov 30
11:44:19 2005
@@ -90,6 +90,11 @@
try:
console = XmConsole(domain.getName())
+ # Enable debug dumping, as this causes an Oops on x86_64
+ console.debugMe = True
+
+ # In case the domain is rebooted
+ console.sendInput("ls")
run = console.runCmd("ls | grep proc")
if run["return"] != 0:
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home