diff options
author | Ewan Mellor <ewan@xensource.com> | 2007-03-23 11:11:41 +0000 |
---|---|---|
committer | Ewan Mellor <ewan@xensource.com> | 2007-03-23 11:11:41 +0000 |
commit | 69869aa63264e44a52b6801194b1cd047f1d761e (patch) | |
tree | fd937333719ae7f7949f0ec8c46b79b8729ba8ca /tools/xm-test | |
parent | 761bc92430a11def142bc26c834238d5252282a8 (diff) | |
download | xen-69869aa63264e44a52b6801194b1cd047f1d761e.tar.gz xen-69869aa63264e44a52b6801194b1cd047f1d761e.tar.bz2 xen-69869aa63264e44a52b6801194b1cd047f1d761e.zip |
Replace tabs with spaces.
Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
Diffstat (limited to 'tools/xm-test')
23 files changed, 59 insertions, 60 deletions
diff --git a/tools/xm-test/lib/XmTestLib/NetConfig.py b/tools/xm-test/lib/XmTestLib/NetConfig.py index 25ccef7ed5..f6397fece3 100644 --- a/tools/xm-test/lib/XmTestLib/NetConfig.py +++ b/tools/xm-test/lib/XmTestLib/NetConfig.py @@ -87,7 +87,7 @@ class NetConfig: else: self.netmask = NETMASK self.network = NETWORK - s_ip = '' + s_ip = '' # Get starting ip and max ip from configured ip range s_ip = NETWORK_IP_RANGE diff --git a/tools/xm-test/lib/XmTestLib/XenDevice.py b/tools/xm-test/lib/XmTestLib/XenDevice.py index cbe16d5658..d899a5e4c8 100644 --- a/tools/xm-test/lib/XmTestLib/XenDevice.py +++ b/tools/xm-test/lib/XmTestLib/XenDevice.py @@ -98,8 +98,8 @@ class XenDevice: self.domain = domain self.configNode = None # Commands run when domain is started or devices added and removed. - self.dom0_cmds = [] - self.domU_cmds = [] + self.dom0_cmds = [] + self.domU_cmds = [] def __str__(self): """Convert device config to XenConfig node compatible string""" @@ -178,7 +178,7 @@ class XenNetDevice(XenDevice): self.dom0_alias_ip = None if domain.getDomainType() == "HVM": - self.config["type"] = "ioemu" + self.config["type"] = "ioemu" if not self.config.has_key('bridge'): self.config["bridge"] = "xenbr0" @@ -252,7 +252,7 @@ class XenNetDevice(XenDevice): if (self.ip and not ip) or ((self.ip and ip) and (self.ip != ip)): self.releaseNetDevIP() - if not self.netmask: + if not self.netmask: self.netmask = xmtest_netconf.getNetMask() if not self.network: diff --git a/tools/xm-test/lib/XmTestLib/arch.py b/tools/xm-test/lib/XmTestLib/arch.py index 331ede5414..b13d41dcc9 100644 --- a/tools/xm-test/lib/XmTestLib/arch.py +++ b/tools/xm-test/lib/XmTestLib/arch.py @@ -94,7 +94,7 @@ def ppc_checkBuffer(buffer): for i in range(0, len(checks)): check=checks[i] if check.get('pattern').search(buffer): - FAIL(check.get('message')) + FAIL(check.get('message')) return diff --git a/tools/xm-test/lib/XmTestReport/OSReport.py b/tools/xm-test/lib/XmTestReport/OSReport.py index cb4759ea3b..80bb4bed53 100644 --- a/tools/xm-test/lib/XmTestReport/OSReport.py +++ b/tools/xm-test/lib/XmTestReport/OSReport.py @@ -149,16 +149,16 @@ class OperatingSystem: return None, None def __debianStyleRelease(self): - if os.access("/etc/debian_version", os.R_OK): - rFile = file("/etc/debian_version") - else: - rFile = None + if os.access("/etc/debian_version", os.R_OK): + rFile = file("/etc/debian_version") + else: + rFile = None - if not rFile: - return None, None + if not rFile: + return None, None - line = rFile.readline() - return "Debian", line.rstrip("\n"); + line = rFile.readline() + return "Debian", line.rstrip("\n"); def __lsbStyleRelease(self): if os.access("/etc/lsb-release", os.R_OK): diff --git a/tools/xm-test/lib/XmTestReport/Report.py b/tools/xm-test/lib/XmTestReport/Report.py index 92412b8770..4cca826c96 100644 --- a/tools/xm-test/lib/XmTestReport/Report.py +++ b/tools/xm-test/lib/XmTestReport/Report.py @@ -86,7 +86,7 @@ def encodeForm(fieldList): def postResults(report_server, results): if not re.match('http://', report_server): - report_server = 'http://'+report_server + report_server = 'http://'+report_server (report_host,report_url) = urlparse(report_server)[1:3] conn = httplib.HTTPConnection(report_host) diff --git a/tools/xm-test/tests/create/04_create_conflictname_neg.py b/tools/xm-test/tests/create/04_create_conflictname_neg.py index e141a3bd81..7faa0b2521 100644 --- a/tools/xm-test/tests/create/04_create_conflictname_neg.py +++ b/tools/xm-test/tests/create/04_create_conflictname_neg.py @@ -34,8 +34,8 @@ try: except DomainError, e: eyecatcher = "Fail" # Stop the domain1 (nice shutdown) - domain1.stop() + domain1.stop() if eyecatcher != "Fail": - domain2.stop() - FAIL("xm create let me create a duplicate-named domain!") + domain2.stop() + FAIL("xm create let me create a duplicate-named domain!") diff --git a/tools/xm-test/tests/create/06_create_mem_neg.py b/tools/xm-test/tests/create/06_create_mem_neg.py index f8bc946bcd..8584b35554 100644 --- a/tools/xm-test/tests/create/06_create_mem_neg.py +++ b/tools/xm-test/tests/create/06_create_mem_neg.py @@ -16,7 +16,7 @@ from XmTestLib import * rdpath = os.environ.get("RD_PATH") if not rdpath: - rdpath = "../ramdisk" + rdpath = "../ramdisk" # Test 1: create a domain with mem=0 config1 = {"memory": 0} @@ -29,8 +29,8 @@ except DomainError, e: eyecatcher1 = "Fail" if eyecatcher1 != "Fail": - domain1.stop() - FAIL("xm create let me create a domain with 0 memory") + domain1.stop() + FAIL("xm create let me create a domain with 0 memory") # Test 2: create a domain with mem>sys_mem @@ -48,6 +48,6 @@ except DomainError, e: eyecatcher2 = "Fail" if eyecatcher2 != "Fail": - domain2.stop() - FAIL("xm create let me create a domain with mem > sys_mem") + domain2.stop() + FAIL("xm create let me create a domain with mem > sys_mem") diff --git a/tools/xm-test/tests/create/07_create_mem64_pos.py b/tools/xm-test/tests/create/07_create_mem64_pos.py index 1a27d55722..f9ed87864c 100644 --- a/tools/xm-test/tests/create/07_create_mem64_pos.py +++ b/tools/xm-test/tests/create/07_create_mem64_pos.py @@ -15,12 +15,12 @@ from XmTestLib import * rdpath = os.environ.get("RD_PATH") if not rdpath: - rdpath = "../ramdisk" + rdpath = "../ramdisk" #get current free memory info mem = int(getInfo("free_memory")) if mem < 64: - SKIP("This test needs 64 MB of free memory (%i MB avail)" % mem) + SKIP("This test needs 64 MB of free memory (%i MB avail)" % mem) #create a domain with mem=64 config = {"memory": 64} @@ -39,11 +39,11 @@ except DomainError, e: eyecatcher1 = str(isDomainRunning(domain_mem64.getName())) if eyecatcher1 != "True": - FAIL("Failed to verify that a 64MB domain started") + FAIL("Failed to verify that a 64MB domain started") eyecatcher2 = getDomMem(domain_mem64.getName()) if eyecatcher2 not in range(62, 65): - FAIL("Started domain with 64MB, but it got %i MB" % eyecatcher2) + FAIL("Started domain with 64MB, but it got %i MB" % eyecatcher2) #stop the domain (nice shutdown) domain_mem64.stop() diff --git a/tools/xm-test/tests/create/08_create_mem128_pos.py b/tools/xm-test/tests/create/08_create_mem128_pos.py index 85d35173c7..f8acd4e62e 100644 --- a/tools/xm-test/tests/create/08_create_mem128_pos.py +++ b/tools/xm-test/tests/create/08_create_mem128_pos.py @@ -15,12 +15,12 @@ from XmTestLib import * rdpath = os.environ.get("RD_PATH") if not rdpath: - rdpath = "../ramdisk" + rdpath = "../ramdisk" #get current free memory info mem = int(getInfo("free_memory")) if mem < 128: - SKIP("This test needs 128 MB of free memory (%i MB avail)" % mem) + SKIP("This test needs 128 MB of free memory (%i MB avail)" % mem) #create a domain with mem=128 config={"memory": 128} @@ -39,11 +39,11 @@ except DomainError, e: eyecatcher1 = str(isDomainRunning(domain_mem128.getName())) if eyecatcher1 != "True": - FAIL("Failed to verify that a 128MB domain started") + FAIL("Failed to verify that a 128MB domain started") eyecatcher2 = getDomMem(domain_mem128.getName()) if eyecatcher2 not in range(126, 129): - FAIL("Started domain with 128MB, but it got %i MB" % eyecatcher2) + FAIL("Started domain with 128MB, but it got %i MB" % eyecatcher2) #stop the domain (nice shutdown) domain_mem128.stop() diff --git a/tools/xm-test/tests/create/09_create_mem256_pos.py b/tools/xm-test/tests/create/09_create_mem256_pos.py index 28db3dade2..71c2e1bc13 100644 --- a/tools/xm-test/tests/create/09_create_mem256_pos.py +++ b/tools/xm-test/tests/create/09_create_mem256_pos.py @@ -15,12 +15,12 @@ from XmTestLib import * rdpath = os.environ.get("RD_PATH") if not rdpath: - rdpath = "../ramdisk" + rdpath = "../ramdisk" #get current free memory info mem = int(getInfo("free_memory")) if mem < 256: - SKIP("This test needs 256 MB of free memory (%i MB avail)" % mem) + SKIP("This test needs 256 MB of free memory (%i MB avail)" % mem) #create a domain with mem=256 config = {"memory": 256} @@ -39,11 +39,11 @@ except DomainError, e: eyecatcher1 = str(isDomainRunning(domain_mem256.getName())) if eyecatcher1 != "True": - FAIL("Failed to verify that a 256MB domain started") + FAIL("Failed to verify that a 256MB domain started") eyecatcher2 = getDomMem(domain_mem256.getName()) if eyecatcher2 not in range(254, 257): - FAIL("Started domain with 256MB, but it got %i MB" % eyecatcher2) + FAIL("Started domain with 256MB, but it got %i MB" % eyecatcher2) #stop the domain (nice shutdown) domain_mem256.stop() diff --git a/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py b/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py index e71bf6935d..89c1cc968f 100644 --- a/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py +++ b/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py @@ -51,12 +51,12 @@ except TimeoutError, e: FAIL(str(e)) if status != 0: - FAIL("xm migrate returned invalid %i != 0" % status) + FAIL("xm migrate returned invalid %i != 0" % status) new_domid = domid(domain.getName()) if (old_domid == new_domid): - FAIL("xm migrate failed, domain id is still %s" % old_domid) + FAIL("xm migrate failed, domain id is still %s" % old_domid) # Attach a console to it try: diff --git a/tools/xm-test/tests/network-attach/04_network_attach_baddomain_neg.py b/tools/xm-test/tests/network-attach/04_network_attach_baddomain_neg.py index f69adb6e82..bcc4c2b32f 100644 --- a/tools/xm-test/tests/network-attach/04_network_attach_baddomain_neg.py +++ b/tools/xm-test/tests/network-attach/04_network_attach_baddomain_neg.py @@ -10,6 +10,6 @@ status, output = traceCommand("xm network-attach NOT-EXIST") eyecatcher = "Error" where = output.find(eyecatcher) if status == 0: - FAIL("xm network-attach returned bad status, expected non 0, status is: %i" % status ) + FAIL("xm network-attach returned bad status, expected non 0, status is: %i" % status ) elif where == -1: - FAIL("xm network-attach returned bad output, expected Error, output is: %s" % output ) + FAIL("xm network-attach returned bad output, expected Error, output is: %s" % output ) diff --git a/tools/xm-test/tests/network-attach/network_utils.py b/tools/xm-test/tests/network-attach/network_utils.py index 93fe72a811..0d1c2a726b 100644 --- a/tools/xm-test/tests/network-attach/network_utils.py +++ b/tools/xm-test/tests/network-attach/network_utils.py @@ -51,6 +51,6 @@ def network_detach(domain_name, console, num=0): eths_after = count_eth(console) if eths_after != (eths_before-1): - return -2, "Network device was not actually disconnected from domU" + return -2, "Network device was not actually disconnected from domU" return 0, None diff --git a/tools/xm-test/tests/pause/01_pause_basic_pos.py b/tools/xm-test/tests/pause/01_pause_basic_pos.py index c104cd9790..083e366617 100644 --- a/tools/xm-test/tests/pause/01_pause_basic_pos.py +++ b/tools/xm-test/tests/pause/01_pause_basic_pos.py @@ -39,7 +39,7 @@ domain.closeConsole() # Pause the domain status, output = traceCommand("xm pause %s" % domain.getName()) if status != 0: - FAIL("xm pause returned invalid %i != 0", status) + FAIL("xm pause returned invalid %i != 0", status) # Try to attach a console to it try: @@ -56,7 +56,7 @@ domain.closeConsole() status, output = traceCommand("xm unpause %s" % domain.getName()) if status != 0: - FAIL("xm unpause returned invalid %i != 0", status) + FAIL("xm unpause returned invalid %i != 0", status) # Stop the domain (nice shutdown) domain.stop() diff --git a/tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py b/tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py index 1c9315869f..92b09e9e01 100644 --- a/tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py +++ b/tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py @@ -46,9 +46,9 @@ ACMLabelResource(resource1, resourcelabel1) block_utils.block_attach(domain, resource1, "xvda1") try: - run1 = console.runCmd("cat /proc/partitions") + run1 = console.runCmd("cat /proc/partitions") except ConsoleError, e: - FAIL(str(e)) + FAIL(str(e)) #Explicitly label the 2nd resource ACMLabelResource(resource2, resourcelabel2) @@ -62,9 +62,9 @@ for i in range(10): time.sleep(1) try: - run2 = console.runCmd("cat /proc/partitions") + run2 = console.runCmd("cat /proc/partitions") except ConsoleError, e: - FAIL(str(e)) + FAIL(str(e)) # Close the console domain.closeConsole() diff --git a/tools/xm-test/tests/unpause/01_unpause_basic_pos.py b/tools/xm-test/tests/unpause/01_unpause_basic_pos.py index 7bd2f1f20e..9c0dc6373a 100644 --- a/tools/xm-test/tests/unpause/01_unpause_basic_pos.py +++ b/tools/xm-test/tests/unpause/01_unpause_basic_pos.py @@ -46,18 +46,17 @@ for i in range(100): # Pause the domain status, output = traceCommand("xm pause %s" % domain.getName()) if status != 0: - FAIL("xm pause returned invalid %i != 0", status) + FAIL("xm pause returned invalid %i != 0", status) else: # Unpause the domain status, output = traceCommand("xm unpause %s" % domain.getName()) if status != 0: - FAIL("xm unpause returned invalud %i != 0", status) - + FAIL("xm unpause returned invalud %i != 0", status) # Make sure the domain is unpaused before we finish up status, output = traceCommand("xm unpause %s" % domain.getName()) if status != 0: - FAIL("xm unpause returned invalid %i != 0", status) + FAIL("xm unpause returned invalid %i != 0", status) # Are we still alive after all that? try: diff --git a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py b/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py index 587ee96606..62ecfb86bd 100644 --- a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py +++ b/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py @@ -49,4 +49,4 @@ domain.stop() vtpm_cleanup(domName) if not re.search("PCR-00:",run["output"]): - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") + FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") diff --git a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py b/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py index 0d08af8745..4740cdef18 100644 --- a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py +++ b/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py @@ -97,7 +97,7 @@ while loop < 3: if not re.search("PCR-00:",run["output"]): saveLog(console.getHistory()) vtpm_cleanup(domName) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") + FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") loop += 1 diff --git a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py b/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py index 4b38e92355..0a2f32cb53 100644 --- a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py +++ b/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py @@ -91,7 +91,7 @@ while loop < 3: if not re.search("PCR-00:",run["output"]): saveLog(console.getHistory()) vtpm_cleanup(domName) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") + FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") loop += 1 diff --git a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py b/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py index 28f4e038b9..14102c7331 100644 --- a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py +++ b/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py @@ -91,7 +91,7 @@ while loop < 3: if not re.search("PCR-00:",run["output"]): saveLog(console.getHistory()) vtpm_cleanup(domName) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") + FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") loop += 1 diff --git a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py b/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py index 42661b83d8..77a216cf16 100644 --- a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py +++ b/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py @@ -122,12 +122,12 @@ while loop < 3: if not re.search("PCR-00:",run["output"]): saveLog(console.getHistory()) vtpm_cleanup(domName) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") + FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") if not re.search("PCR-00: 1E A7 BD",run["output"]): saveLog(console.getHistory()) vtpm_cleanup(domName) - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) + FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) loop += 1 diff --git a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py b/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py index f86e050519..0f59677f7d 100644 --- a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py +++ b/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py @@ -116,12 +116,12 @@ while loop < 3: if not re.search("PCR-00:",run["output"]): saveLog(console.getHistory()) vtpm_cleanup(domName) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") + FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") if not re.search("PCR-00: 1E A7 BD",run["output"]): saveLog(console.getHistory()) vtpm_cleanup(domName) - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) + FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) loop += 1 diff --git a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py b/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py index f1b460c0e2..2061992f64 100644 --- a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py +++ b/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py @@ -116,12 +116,12 @@ while loop < 3: if not re.search("PCR-00:",run["output"]): saveLog(console.getHistory()) vtpm_cleanup(domName) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") + FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") if not re.search("PCR-00: 1E A7 BD",run["output"]): saveLog(console.getHistory()) vtpm_cleanup(domName) - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) + FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) loop += 1 |