[Xen-changelog] [xen-unstable] [XM-TEST] vTPM test changes

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1173779571 0
# Node ID 2f63ed3c5fb9ee5d64fbc028477d0120e034c0cd
# Parent  f2f83691f7148b9780f8e6e4dd0475970a3645cf
[XM-TEST] vTPM test changes

Remove an uninitialized variable.
For some reason the 'ps aux' command does not see the process anymore
(since some time on the weekend). Need to add 'COLUMNS=n'.

Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxx>
---
 tools/xm-test/tests/vtpm/09_vtpm-xapi.py |    2 +-
 tools/xm-test/tests/vtpm/vtpm_utils.py   |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff -r f2f83691f714 -r 2f63ed3c5fb9 tools/xm-test/tests/vtpm/09_vtpm-xapi.py
--- a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py  Tue Mar 13 09:52:11 2007 +0000
+++ b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py  Tue Mar 13 09:52:51 2007 +0000
@@ -91,7 +91,7 @@ try:
 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 -r f2f83691f714 -r 2f63ed3c5fb9 tools/xm-test/tests/vtpm/vtpm_utils.py
--- a/tools/xm-test/tests/vtpm/vtpm_utils.py    Tue Mar 13 09:52:11 2007 +0000
+++ b/tools/xm-test/tests/vtpm/vtpm_utils.py    Tue Mar 13 09:52:51 2007 +0000
@@ -8,7 +8,8 @@ if ENABLE_HVM_SUPPORT:
 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")

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