Mailing List Archive

# HG changeset patch
# User emellor@leeni.uk.xensource.com
# Node ID d8c7f144ca5425f493447a8bdfab668c64feb5e9
# Parent c28794c159c1704bfe4780e8a4f0b6c0e16a70a8
Fix block_attach_shared tests. When the sharing check succeeds, the domain
is created but left paused, so it is necessary to destroy the domain afterwards,
whether the test succeeded or failed.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff -r c28794c159c1 -r d8c7f144ca54 tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py
--- a/tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py Thu Dec 15 13:39:16 2005
+++ b/tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py Thu Dec 15 13:49:07 2005
@@ -34,3 +34,5 @@
FAIL("Bug #331: Started a DomU with write access to a rw mounted block device")
except DomainError, e:
s, o = traceCommand("umount mnt")
+
+domain.destroy()
diff -r c28794c159c1 -r d8c7f144ca54 tools/xm-test/tests/block-create/12_block_attach_shared_domU.py
--- a/tools/xm-test/tests/block-create/12_block_attach_shared_domU.py Thu Dec 15 13:39:16 2005
+++ b/tools/xm-test/tests/block-create/12_block_attach_shared_domU.py Thu Dec 15 13:49:07 2005
@@ -20,8 +20,11 @@
FAIL("Unable to start domain")

try:
- dom2.start()
+ try:
+ dom2.start()
+ FAIL("Bug #331: Started a DomU with write access to an in-use block device")
+ except DomainError, e:
+ pass
+finally:
dom1.destroy()
- FAIL("Bug #331: Started a DomU with write access to an in-use block device")
-except DomainError, e:
- dom1.destroy()
+ dom2.destroy()

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