diff options
author | Hollis Blanchard <hollisb@us.ibm.com> | 2006-11-29 14:16:36 -0600 |
---|---|---|
committer | Hollis Blanchard <hollisb@us.ibm.com> | 2006-11-29 14:16:36 -0600 |
commit | ab26a6a563a0acb589af87a8e063c0e171d75665 (patch) | |
tree | 71a432bde5d016e928ab3ad7860fca01312ec787 /tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py | |
parent | d3be8a6ca1aa9312cc01e780a2fea56ab8ec12b4 (diff) | |
parent | 1c804664cf63f0c2e80d0420e52d5f82c3956685 (diff) | |
download | xen-ab26a6a563a0acb589af87a8e063c0e171d75665.tar.gz xen-ab26a6a563a0acb589af87a8e063c0e171d75665.tar.bz2 xen-ab26a6a563a0acb589af87a8e063c0e171d75665.zip |
Merge with xen-unstable.hg.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Diffstat (limited to 'tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py')
-rw-r--r-- | tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py b/tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py index 38d60a92c1..292db063d6 100644 --- a/tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py +++ b/tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py @@ -12,7 +12,7 @@ def checkXmLongList(domain): s, o = traceCommand("xm list --long %s" % domain.getName()) if s != 0: FAIL("xm list --long <dom> failed") - if re.search("hda1", o): + if re.search("xvda1", o): return True else: return False @@ -27,12 +27,12 @@ try: except DomainError,e: FAIL(str(e)) -block_attach(domain, "phy:/dev/ram0", "hda1") +block_attach(domain, "phy:/dev/ram0", "xvda1") if not checkXmLongList(domain): - FAIL("xm long list does not show that hda1 was attached") + FAIL("xm long list does not show that xvda1 was attached") -block_detach(domain, "hda1") +block_detach(domain, "xvda1") if checkXmLongList(domain): - FAIL("xm long list does not show that hda1 was removed") + FAIL("xm long list does not show that xvda1 was removed") |