# HG changeset patch # User Richard Maciel <rmaciel@linux.vnet.ibm.com> # Date 1259357082 7200 # Node ID 7ce11553d0f236f8bd961852720e33a6f7c63ac3 # Parent cdb453f85c01098c4e1bce2ff23dc075f2148390 [TEST] (#3) LXC currently doesn't support VNC, so skip appropriated tests #2: - Added missing testcase fix #3: - Fixed codestyle Signed-off-by: Richard Maciel <rmaciel@linux.vnet.ibm.com> diff -r cdb453f85c01 -r 7ce11553d0f2 suites/libvirt-cim/cimtest/HostedAccessPoint/01_forward.py --- a/suites/libvirt-cim/cimtest/HostedAccessPoint/01_forward.py Sat Dec 05 02:22:09 2009 -0200 +++ b/suites/libvirt-cim/cimtest/HostedAccessPoint/01_forward.py Fri Nov 27 19:24:42 2009 -0200 @@ -110,6 +110,9 @@ "skipping the tc ....") return SKIP + if options.virt == 'LXC': + logger.info("VNC is not supported by LXC, hence skipping the tc ....") + return SKIP status, cxml = setup_env(options.ip, options.virt) if status != PASS: diff -r cdb453f85c01 -r 7ce11553d0f2 suites/libvirt-cim/cimtest/HostedAccessPoint/02_reverse.py --- a/suites/libvirt-cim/cimtest/HostedAccessPoint/02_reverse.py Sat Dec 05 02:22:09 2009 -0200 +++ b/suites/libvirt-cim/cimtest/HostedAccessPoint/02_reverse.py Fri Nov 27 19:24:42 2009 -0200 @@ -116,6 +116,10 @@ logger.info("'HostedAccessPoint' provider not supported, hence " + "skipping the tc ....") return SKIP + + if options.virt == 'LXC': + logger.info("VNC is not supported by LXC, hence skipping the tc ....") + return SKIP status, cxml = setup_env(options.ip, options.virt) if status != PASS: diff -r cdb453f85c01 -r 7ce11553d0f2 suites/libvirt-cim/cimtest/KVMRedirectionSAP/01_enum_KVMredSAP.py --- a/suites/libvirt-cim/cimtest/KVMRedirectionSAP/01_enum_KVMredSAP.py Sat Dec 05 02:22:09 2009 -0200 +++ b/suites/libvirt-cim/cimtest/KVMRedirectionSAP/01_enum_KVMredSAP.py Fri Nov 27 19:24:42 2009 -0200 @@ -100,6 +100,10 @@ classname) return SKIP + if virt == 'LXC': + logger.info("VNC is not supported by LXC, hence skipping the tc ....") + return SKIP + vsxml = None action_start = False diff -r cdb453f85c01 -r 7ce11553d0f2 suites/libvirt-cim/cimtest/RedirectionService/03_RedirectionSAP_errs.py --- a/suites/libvirt-cim/cimtest/RedirectionService/03_RedirectionSAP_errs.py Sat Dec 05 02:22:09 2009 -0200 +++ b/suites/libvirt-cim/cimtest/RedirectionService/03_RedirectionSAP_errs.py Fri Nov 27 19:24:42 2009 -0200 @@ -76,6 +76,10 @@ "hence skipping the test ....") return SKIP + if options.virt == 'LXC': + logger.info("VNC is not supported by LXC, hence skipping the tc ....") + return SKIP + # Getting the VS list and deleting the test_dom if it already exists. cxml = vxml.get_class(options.virt)(test_dom, vcpus=test_vcpus) ret = cxml.cim_define(options.ip) diff -r cdb453f85c01 -r 7ce11553d0f2 suites/libvirt-cim/cimtest/VirtualSystemManagementService/20_verify_vnc_password.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/20_verify_vnc_password.py Sat Dec 05 02:22:09 2009 -0200 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/20_verify_vnc_password.py Fri Nov 27 19:24:42 2009 -0200 @@ -76,6 +76,10 @@ logger.info("VNC Password support not available, feature available in"\ " '%s' revision..", libvirtcim_vnc_passwd_changes) return SKIP + + if virt == 'LXC': + logger.info("VNC is not supported by LXC, hence skipping the tc ....") + return SKIP cxml = vxml.get_class(virt)(default_dom, vnc_passwd=passwd)