aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir@xensource.com>2007-04-19 19:29:45 +0100
committerKeir Fraser <keir@xensource.com>2007-04-19 19:29:45 +0100
commit37b9dfbf71f9b6db47ba603e40a95addd8a0a0f3 (patch)
tree892c5521fd3d46eb471020e6d7d09cec9fed2560
parent856a272f3590d96129d004839af719b7d018548f (diff)
downloadxen-37b9dfbf71f9b6db47ba603e40a95addd8a0a0f3.tar.gz
xen-37b9dfbf71f9b6db47ba603e40a95addd8a0a0f3.tar.bz2
xen-37b9dfbf71f9b6db47ba603e40a95addd8a0a0f3.zip
[vtpm] Return a proper error when in the Xen-API call.
Fix a bug in the test. Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
-rw-r--r--tools/python/xen/xend/XendAPI.py2
-rw-r--r--tools/xm-test/tests/vtpm/09_vtpm-xapi.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/python/xen/xend/XendAPI.py b/tools/python/xen/xend/XendAPI.py
index 9e5a8d0f69..11d1f9b470 100644
--- a/tools/python/xen/xend/XendAPI.py
+++ b/tools/python/xen/xend/XendAPI.py
@@ -2372,7 +2372,7 @@ class XendAPI(object):
if not cfg:
return xen_api_error(['HANDLE_INVALID', 'VTPM', vtpm_ref])
if not cfg.has_key('backend'):
- return xen_api_error(['VTPM backend not set'])
+ return xen_api_error(['INTERNAL_ERROR', 'VTPM backend not set'])
return xen_api_success(cfg['backend'])
def VTPM_get_VM(self, session, vtpm_ref):
diff --git a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py
index 15775801f6..5c8fb11880 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)")
+ FAIL("Unable to create domain.")
try:
console.sendInput("input")