Re: [Libvirt-cim] [PATCHv2] [TEST] Fix syntax errors, small tweaks

From: Eduardo Lima (Etrunko)<eblima(a)br.ibm.com> suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py: - Unecessary virt param suites/libvirt-cim/cimtest/VirtualSystemManagementService/31_unset_netrasd.py: - Undefined symbols XFAIL, SKIP suites/libvirt-cim/main.py - options referenced in except block without being defined Signed-off-by: Eduardo Lima (Etrunko)<eblima(a)br.ibm.com> --- .../08_modifyresource.py | 8 ++++---- .../31_unset_netrasd.py | 2 +- suites/libvirt-cim/main.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py index 6661ef3..df58d1f 100644 --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py @@ -47,7 +47,7 @@ new_mac1 = "11:%s:22:%s:33:%s" % (new_int, new_int, new_int) new_int += 1 new_mac2 = "11:%s:22:%s:33:%s" % (new_int, new_int, new_int) -def cleanup_env(ip, virt, cxml): +def cleanup_env(ip, cxml): cxml.destroy(ip) cxml.undefine(ip) @@ -82,13 +82,13 @@ def main(): ret = cxml.cim_define(options.ip) if not ret: logger.error("Failed to define the dom: %s", default_dom) - cleanup_env(options.ip, options.virt, cxml) + cleanup_env(options.ip, cxml) return FAIL if case == "start": ret = cxml.start(options.ip) if not ret: logger.error("Failed to start the dom: %s", default_dom) - cleanup_env(options.ip, options.virt, cxml) + cleanup_env(options.ip, cxml) return FAIL status = vsms_util.mod_vcpu_res(options.ip, service, cxml, pasd, ncpu, @@ -114,7 +114,7 @@ def main(): if status != PASS: break - cleanup_env(options.ip, options.virt, cxml) + cleanup_env(options.ip, cxml) return status diff --git a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/31_unset_netrasd.py b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/31_unset_netrasd.py index 417ad7f..9c78eb8 100755 --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/31_unset_netrasd.py +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/31_unset_netrasd.py @@ -28,7 +28,7 @@ import sys import pywbem -from CimTest.ReturnCodes import PASS, FAIL +from CimTest.ReturnCodes import PASS, FAIL, XFAIL, SKIP from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS from XenKvmLib.const import do_main from XenKvmLib.classes import get_typed_class diff --git a/suites/libvirt-cim/main.py b/suites/libvirt-cim/main.py index 4e7d621..a4e33e6 100644 --- a/suites/libvirt-cim/main.py +++ b/suites/libvirt-cim/main.py @@ -306,8 +306,8 @@ def main(options, args): if __name__ == '__main__': ret = -1 + options, args = parser.parse_args() try: - options, args = parser.parse_args() ret = main(options, args) except (KeyboardInterrupt, SystemExit): print "\nKeyboardInterrupt. Cleaning up..."