# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1239592696 25200 # Node ID 9ed17bb61735ba341a323e1c2c105ae9091cf235 # Parent 6027a48279e6daff21453a30b3749a0b79218c8a [TEST] Fix 03_hs_to_settdefcap.py with the provider's changes of the output of ac association when using DiskPool as input Tested for KVM with current sources and rpm Signed-off-by: Guolian Yun<yunguol@cn.ibm.com> diff -r 6027a48279e6 -r 9ed17bb61735 suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py --- a/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Tue Apr 07 06:29:37 2009 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Sun Apr 12 20:18:16 2009 -0700 @@ -57,6 +57,7 @@ test_vcpus = 1 libvirt_rasd_template_changes = 707 libvirt_rasd_new_changes = 805 +libvirt_ac_diskpool_changes = 839 def setup_env(server, virt="Xen"): status = PASS @@ -227,8 +228,11 @@ if curr_cim_rev >= libvirt_rasd_new_changes: exp_len = 16 if virt == 'KVM': - if curr_cim_rev >= libvirt_rasd_new_changes: + if curr_cim_rev >= libvirt_rasd_new_changes and \ + curr_cim_rev < libvirt_ac_diskpool_changes: exp_len = 8 + else: + exp_len = 56 if len(assoc_info) != exp_len: logger.error("'%s' returned %i RASD objects instead of %i",