diff options
| author | Ewan Mellor <ewan@xensource.com> | 2006-11-01 08:39:45 +0000 |
|---|---|---|
| committer | Ewan Mellor <ewan@xensource.com> | 2006-11-01 08:39:45 +0000 |
| commit | 3cb85f33f0d60f89cf4afd37d94fb1cdaf561e6d (patch) | |
| tree | 44c2a7f1205ea0b37af589873d17cf84a6bb1bc3 /tools/xm-test/tests/block-integrity | |
| parent | 240c6346f7701456333ee5031b81e772a51a2414 (diff) | |
| download | xen-3cb85f33f0d60f89cf4afd37d94fb1cdaf561e6d.tar.gz xen-3cb85f33f0d60f89cf4afd37d94fb1cdaf561e6d.tar.bz2 xen-3cb85f33f0d60f89cf4afd37d94fb1cdaf561e6d.zip | |
Update all block tests to use the Xen Virtual Block Device (xvd) rather than IDEor SCSI.
This patch also modifies
09_block_attach_and_dettach_device_check_data_pos.py to force / to be
read-write otherwise the mkdir fails.
Also Whistspace cleanups.
Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Diffstat (limited to 'tools/xm-test/tests/block-integrity')
| -rw-r--r-- | tools/xm-test/tests/block-integrity/01_block_device_read_verify.py | 4 | ||||
| -rw-r--r-- | tools/xm-test/tests/block-integrity/02_block_device_write_verify.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/xm-test/tests/block-integrity/01_block_device_read_verify.py b/tools/xm-test/tests/block-integrity/01_block_device_read_verify.py index b4f03da628..28531f1559 100644 --- a/tools/xm-test/tests/block-integrity/01_block_device_read_verify.py +++ b/tools/xm-test/tests/block-integrity/01_block_device_read_verify.py @@ -33,10 +33,10 @@ s, o = traceCommand("md5sum /dev/ram1") dom0_md5sum_match = re.search(r"^[\dA-Fa-f]{32}", o, re.M) -block_attach(domain, "phy:ram1", "hda1") +block_attach(domain, "phy:ram1", "xvda1") try: - run = console.runCmd("md5sum /dev/hda1") + run = console.runCmd("md5sum /dev/xvda1") except ConsoleError, e: FAIL(str(e)) diff --git a/tools/xm-test/tests/block-integrity/02_block_device_write_verify.py b/tools/xm-test/tests/block-integrity/02_block_device_write_verify.py index f8fa19aa8b..ed791a008a 100644 --- a/tools/xm-test/tests/block-integrity/02_block_device_write_verify.py +++ b/tools/xm-test/tests/block-integrity/02_block_device_write_verify.py @@ -28,12 +28,12 @@ except DomainError, e: console.setHistorySaveCmds(value=True) -block_attach(domain, "phy:ram1", "hda1") +block_attach(domain, "phy:ram1", "xvda1") console.setTimeout(120) try: - run = console.runCmd("dd if=/dev/urandom bs=512 count=`cat /sys/block/hda1/size` | tee /dev/hda1 | md5sum") + run = console.runCmd("dd if=/dev/urandom bs=512 count=`cat /sys/block/xvda1/size` | tee /dev/xvda1 | md5sum") except ConsoleError, e: FAIL(str(e)) |