[Libvirt-cim] [PATCH] [TEST] #2 Fix VSMS-05_destroysystem_neg.py to work for both Pegasus and sfcb

yunguol at cn.ibm.com yunguol at cn.ibm.com
Wed Aug 13 02:00:23 UTC 2008


# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1218592814 25200
# Node ID c6f6da023a564a0e9fdb33d5aec72af269238a3d
# Parent  d1c7391bcfe9f1ab85effa7e8fa5c21063c8e1f7
[TEST] #2 Fix VSMS-05_destroysystem_neg.py to work for both Pegasus and sfcb

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r d1c7391bcfe9 -r c6f6da023a56 suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py	Tue Aug 12 04:11:28 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py	Tue Aug 12 19:00:14 2008 -0700
@@ -45,8 +45,7 @@
                               keybindings = {'CreationClassName':classname})
 
         exp_value = { 'rc'    : pywbem.CIM_ERR_FAILED,
-                      'desc'  : 'CIM_ERR_FAILED: Unable to retrieve domain\
- name.'
+                      'desc'  : 'Unable to retrieve domain name.'
                     }
 
     elif tc == 'nonexistent':
@@ -55,7 +54,7 @@
                                 'CreationClassName':classname})
 
         exp_value = { 'rc'   : pywbem.CIM_ERR_FAILED,
-                      'desc' : 'CIM_ERR_FAILED: Failed to find domain' 
+                      'desc' : 'Failed to find domain' 
                     }
 
     else:
@@ -68,7 +67,7 @@
     except Exception, details:
         err_no   = details[0]
         err_desc = details[1]
-        if err_no == exp_value['rc'] and err_desc == exp_value['desc']:
+        if err_no == exp_value['rc'] and err_desc.find(exp_value['desc']) >= 0:
             logger.error("For Invalid Scenario '%s'", tc)
             logger.info('Got expected error no: %s', err_no)
             logger.info('Got expected error desc: %s',err_desc)




More information about the Libvirt-cim mailing list