aboutsummaryrefslogtreecommitdiffstats
path: root/tools/xm-test
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-03-03 10:54:24 +0000
committerKeir Fraser <keir.fraser@citrix.com>2008-03-03 10:54:24 +0000
commit66b0efa93689ac2e7468e0fa641c8bf05437a593 (patch)
tree9989b3e4e2046f2bb463d15051845beb6df2e66c /tools/xm-test
parent7dd1649cdbd9af9356c21698f77ea50d2b1fea75 (diff)
downloadxen-66b0efa93689ac2e7468e0fa641c8bf05437a593.tar.gz
xen-66b0efa93689ac2e7468e0fa641c8bf05437a593.tar.bz2
xen-66b0efa93689ac2e7468e0fa641c8bf05437a593.zip
xm-test: Have domains deleted if they are managed domains
Have the domains deleted if they are managed by xend and the tests are run with '-md' as parameter to runtest.sh. Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
Diffstat (limited to 'tools/xm-test')
-rw-r--r--tools/xm-test/tests/security-acm/10_security-acm_pol_update.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/xm-test/tests/security-acm/10_security-acm_pol_update.py b/tools/xm-test/tests/security-acm/10_security-acm_pol_update.py
index b85079de35..441febbf01 100644
--- a/tools/xm-test/tests/security-acm/10_security-acm_pol_update.py
+++ b/tools/xm-test/tests/security-acm/10_security-acm_pol_update.py
@@ -51,7 +51,7 @@ try:
domain_ul.start(noConsole=True)
FAIL("Could start unlabeled domain.")
except DomainError, e:
- pass
+ domain_ul.destroy() # delete if xend-managed domain
config = {"access_control":"policy=%s,label=%s" % (testpolicy,testlabel1)}
@@ -246,7 +246,7 @@ try:
domain_red.start(noConsole=True)
FAIL("Could start 'red' domain.")
except DomainError, e:
- pass
+ domain_red.destroy() # delete if xend-managed domain
# Terminate GREEN domain
domain_green.destroy()