[Libvirt-cim] [PATCH 1 of 4] [TEST] Update CSI and EAFP tests to use do_main from const.py

Kaitlin Rupert kaitlin at linux.vnet.ibm.com
Fri Aug 29 20:26:42 UTC 2008


# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1220041472 25200
# Node ID bc9a4f35b1b48b6111f12d86925c1fbec09780a0
# Parent  946fd46b96866adaab356876f9c8bbf937f0b3d6
[TEST] Update CSI and EAFP tests to use do_main from const.py

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r 946fd46b9686 -r bc9a4f35b1b4 suites/libvirt-cim/cimtest/ComputerSystemIndication/01_created_indication.py
--- a/suites/libvirt-cim/cimtest/ComputerSystemIndication/01_created_indication.py	Thu Aug 28 14:07:25 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ComputerSystemIndication/01_created_indication.py	Fri Aug 29 13:24:32 2008 -0700
@@ -26,7 +26,7 @@
 import time
 from pywbem.cim_obj import CIMInstanceName
 from CimTest.Globals import logger
-from CimTest.Globals import do_main
+from XenKvmLib.const import do_main
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib.common_util import create_using_definesystem, \
                                   call_request_state_change
diff -r 946fd46b9686 -r bc9a4f35b1b4 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py
--- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py	Thu Aug 28 14:07:25 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py	Fri Aug 29 13:24:32 2008 -0700
@@ -51,7 +51,8 @@
 from XenKvmLib.common_util import create_diskpool_conf, cleanup_restore
 from XenKvmLib.classes import get_typed_class
 from XenKvmLib.logicaldevices import field_err
-from CimTest.Globals import do_main, logger
+from CimTest.Globals import logger
+from XenKvmLib.const import do_main
 from CimTest.ReturnCodes import PASS, FAIL
 
 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC']
diff -r 946fd46b9686 -r bc9a4f35b1b4 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py
--- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py	Thu Aug 28 14:07:25 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py	Fri Aug 29 13:24:32 2008 -0700
@@ -49,7 +49,8 @@
 import pywbem
 from XenKvmLib.assoc import Associators
 from XenKvmLib.vxml import get_class
-from CimTest.Globals import do_main, logger, CIM_ERROR_ASSOCIATORS
+from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORS
+from XenKvmLib.const import do_main
 from CimTest.ReturnCodes import PASS, FAIL
 from XenKvmLib.test_doms import destroy_and_undefine_all
 from XenKvmLib.classes import get_typed_class
diff -r 946fd46b9686 -r bc9a4f35b1b4 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py
--- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py	Thu Aug 28 14:07:25 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py	Fri Aug 29 13:24:32 2008 -0700
@@ -35,7 +35,8 @@
 from XenKvmLib.test_doms import destroy_and_undefine_all
 from XenKvmLib.common_util import try_assoc
 from CimTest.ReturnCodes import PASS, FAIL	
-from CimTest.Globals import do_main, platform_sup, logger
+from CimTest.Globals import logger
+from XenKvmLib.const import do_main, platform_sup
 from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class
 from XenKvmLib.common_util import cleanup_restore, test_dpath, \
diff -r 946fd46b9686 -r bc9a4f35b1b4 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py
--- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py	Thu Aug 28 14:07:25 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py	Fri Aug 29 13:24:32 2008 -0700
@@ -36,7 +36,7 @@
 from CimTest import Globals
 from CimTest.Globals import logger
 from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
-from CimTest.Globals import do_main, platform_sup
+from XenKvmLib.const import do_main, platform_sup
 from XenKvmLib.vxml import get_class
 from XenKvmLib.classes import get_typed_class
 from XenKvmLib.common_util import cleanup_restore, test_dpath, \




More information about the Libvirt-cim mailing list