aboutsummaryrefslogtreecommitdiffstats
path: root/tools/xm-test/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tools/xm-test/tests')
-rw-r--r--tools/xm-test/tests/vtpm/09_vtpm-xapi.py2
-rw-r--r--tools/xm-test/tests/vtpm/vtpm_utils.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py
index 6de28805d3..15775801f6 100644
--- a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py
+++ b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py
@@ -91,7 +91,7 @@ if vtpm_uuid not in vm_vtpms:
try:
console = domain.start()
except DomainError, e:
- FAIL("Unable to create domain (%s)" % domName)
+ FAIL("Unable to create domain (%s)")
try:
console.sendInput("input")
diff --git a/tools/xm-test/tests/vtpm/vtpm_utils.py b/tools/xm-test/tests/vtpm/vtpm_utils.py
index 0af46574c9..da65aab5fb 100644
--- a/tools/xm-test/tests/vtpm/vtpm_utils.py
+++ b/tools/xm-test/tests/vtpm/vtpm_utils.py
@@ -8,7 +8,8 @@ from XmTestLib import *
if ENABLE_HVM_SUPPORT:
SKIP("vtpm tests not supported for HVM domains")
-status, output = traceCommand("ps aux | grep vtpm_manager | grep -v grep")
+status, output = traceCommand("COLUMNS=200 ; "
+ "ps aux | grep vtpm_manager | grep -v grep")
if output == "":
SKIP("virtual TPM manager must be started to run this test; might "
"need /dev/tpm0")