# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1233824793 28800
# Node ID 66c41a4a47c1410fdf6be8bf46cc4c6bdafd7971
# Parent edfa908a60d058c7f1ba7394bd1d818999802287
[TEST] Update tests to meet 80-char width limit
1) Split lines to 80-char width limit
Tested for KVM/LXC with current sources
Signed-off-by: Guolian Yun<yunguol(a)cn.ibm.com>
diff -r edfa908a60d0 -r 66c41a4a47c1
suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py Tue Feb 03
09:37:05 2009 -0800
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py Thu Feb 05
01:06:33 2009 -0800
@@ -55,10 +55,9 @@
instanceref = CIMInstanceName(k,
keybindings = {"InstanceID" : v})
names = []
-
+ rafp = get_typed_class(options.virt, "ResourceAllocationFromPool")
try:
- names = conn.AssociatorNames(instanceref,
- AssocClass = get_typed_class(options.virt,
"ResourceAllocationFromPool"))
+ names = conn.AssociatorNames(instanceref, AssocClass = rafp)
rc = 0
except pywbem.CIMError, (rc, desc):
if rc == exp_rc and desc.find(exp_desc) >= 0:
diff -r edfa908a60d0 -r 66c41a4a47c1
suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py
--- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py Tue Feb 03
09:37:05 2009 -0800
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py Thu Feb 05
01:06:33 2009 -0800
@@ -53,10 +53,9 @@
instanceref = CIMInstanceName(k,
keybindings = {"InstanceID" : v})
names = []
-
+ rafp = get_typed_class(options.virt, "ResourceAllocationFromPool")
try:
- names = conn.AssociatorNames(instanceref,
- AssocClass = get_typed_class(options.virt,
"ResourceAllocationFromPool"))
+ names = conn.AssociatorNames(instanceref, AssocClass = rafp)
rc = 0
except pywbem.CIMError, (rc, desc):
if rc == exp_rc and desc.find(exp_desc) >= 0:
diff -r edfa908a60d0 -r 66c41a4a47c1
suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/01_enum.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/01_enum.py Tue Feb 03
09:37:05 2009 -0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/01_enum.py Thu Feb 05
01:06:33 2009 -0800
@@ -39,7 +39,8 @@
def main():
options = main.options
# Expected results from enumeration
- cn = get_typed_class(options.virt,
"VirtualSystemMigrationSettingData")
+ cn = get_typed_class(options.virt,
+ "VirtualSystemMigrationSettingData")
instid = 'MigrationSettingData'
MType = 2 #[CIM_MIGRATE_LIVE]
priority = 0
diff -r edfa908a60d0 -r 66c41a4a47c1
suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py Tue Feb 03
09:37:05 2009 -0800
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py Thu Feb 05
01:06:33 2009 -0800
@@ -72,7 +72,9 @@
return FAIL
if verify_vs_sservice['SystemCreationClassName'] != classname:
- print_error('SystemCreationClassName',
verify_vs_sservice['SystemCreationClassName'], classname)
+ print_error('SystemCreationClassName',
+ verify_vs_sservice['SystemCreationClassName'],
+ classname)
return FAIL
return PASS