WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] Replace tabs with spaces.

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] Replace tabs with spaces.
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Fri, 23 Mar 2007 11:10:11 -0700
Delivery-date: Fri, 23 Mar 2007 11:09:51 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Ewan Mellor <ewan@xxxxxxxxxxxxx>
# Date 1174648301 0
# Node ID 7869f58ff5516713bab0b990100a15c4f944b063
# Parent  a34ab3f899c4150099697858b81b85d7684ba0f7
Replace tabs with spaces.

Signed-off-by: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>
---
 tools/python/xen/xend/server/SrvDomain.py                             |   14 
+++---
 tools/python/xen/xend/server/pciquirk.py                              |   14 
+++---
 tools/python/xen/xm/main.py                                           |    2 
 tools/xenmon/xenmon.py                                                |   22 
+++++-----
 tools/xm-test/lib/XmTestLib/NetConfig.py                              |    2 
 tools/xm-test/lib/XmTestLib/XenDevice.py                              |    8 
+--
 tools/xm-test/lib/XmTestLib/arch.py                                   |    2 
 tools/xm-test/lib/XmTestReport/OSReport.py                            |   20 
++++-----
 tools/xm-test/lib/XmTestReport/Report.py                              |    2 
 tools/xm-test/tests/create/04_create_conflictname_neg.py              |    6 +-
 tools/xm-test/tests/create/06_create_mem_neg.py                       |   10 
++--
 tools/xm-test/tests/create/07_create_mem64_pos.py                     |    8 
+--
 tools/xm-test/tests/create/08_create_mem128_pos.py                    |    8 
+--
 tools/xm-test/tests/create/09_create_mem256_pos.py                    |    8 
+--
 tools/xm-test/tests/migrate/01_migrate_localhost_pos.py               |    4 -
 tools/xm-test/tests/network-attach/04_network_attach_baddomain_neg.py |    4 -
 tools/xm-test/tests/network-attach/network_utils.py                   |    2 
 tools/xm-test/tests/pause/01_pause_basic_pos.py                       |    4 -
 tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py  |    8 
+--
 tools/xm-test/tests/unpause/01_unpause_basic_pos.py                   |    7 
+--
 tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py                          |    2 
 tools/xm-test/tests/vtpm/03_vtpm-susp_res.py                          |    2 
 tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py                          |    2 
 tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py                          |    2 
 tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py                     |    4 -
 tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py                          |    4 -
 tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py                          |    4 -
 27 files changed, 87 insertions(+), 88 deletions(-)

diff -r a34ab3f899c4 -r 7869f58ff551 tools/python/xen/xend/server/SrvDomain.py
--- a/tools/python/xen/xend/server/SrvDomain.py Fri Mar 23 11:04:51 2007 +0000
+++ b/tools/python/xen/xend/server/SrvDomain.py Fri Mar 23 11:11:41 2007 +0000
@@ -101,10 +101,10 @@ class SrvDomain(SrvDir):
 
     def do_dump(self, _, req):
         fn = FormFn(self.xd.domain_dump,
-                   [['dom',         'int'],
-                    ['file',        'str'],
-                    ['live',        'int'],
-                    ['crash',       'int']])
+                    [['dom',         'int'],
+                     ['file',        'str'],
+                     ['live',        'int'],
+                     ['crash',       'int']])
         return fn(req.args, {'dom': self.dom.domid})
 
     def op_migrate(self, op, req):
@@ -139,9 +139,9 @@ class SrvDomain(SrvDir):
                     [['dom', 'int'],
                      ['period', 'int'],
                      ['slice', 'int'],
-                    ['latency', 'int'],
-                    ['extratime', 'int'],
-                    ['weight', 'int']])
+                     ['latency', 'int'],
+                     ['extratime', 'int'],
+                     ['weight', 'int']])
         val = fn(req.args, {'dom': self.dom.domid})
         return val
     
diff -r a34ab3f899c4 -r 7869f58ff551 tools/python/xen/xend/server/pciquirk.py
--- a/tools/python/xen/xend/server/pciquirk.py  Fri Mar 23 11:04:51 2007 +0000
+++ b/tools/python/xen/xend/server/pciquirk.py  Fri Mar 23 11:11:41 2007 +0000
@@ -74,7 +74,7 @@ class PCIQuirk:
                 self.pci_quirks_config = pci_quirks_config
             except Exception, ex:
                 raise XendError("Reading config file %s: %s" %
-                               (QUIRK_CONFIG_FILE, str(ex)))
+                                (QUIRK_CONFIG_FILE, str(ex)))
         else:
             log.info("Config file does not exist: %s" % QUIRK_CONFIG_FILE)
             self.pci_quirks_config = ['xend-pci-quirks']
@@ -83,7 +83,7 @@ class PCIQuirk:
         for dev in devices:
             ids = child_at(child(dev,'pci_ids'),0)
             fields = child_at(child(dev,'pci_config_space_fields'),0)
-           if self.__matchPCIdev( ids ):
+            if self.__matchPCIdev( ids ):
                 log.info("Quirks found for PCI device [%s]" % self.devid)
                 return fields
 
@@ -93,11 +93,11 @@ class PCIQuirk:
     def __sendQuirks(self):
         for quirk in self.quirks:
             log.debug("Quirk Info: %04x:%02x:%02x.%1x-%s" % (self.domain,
-                   self.bus, self.slot, self.func, quirk))
+                      self.bus, self.slot, self.func, quirk))
             try:
                 f = file(QUIRK_SYSFS_NODE ,"w")
                 f.write( "%04x:%02x:%02x.%1x-%s" % (self.domain, self.bus,
-                       self.slot, self.func, quirk) )
+                        self.slot, self.func, quirk) )
                 f.close()
             except Exception, e:
                 raise VmError("pci: failed to open/write/close quirks " +
@@ -118,13 +118,13 @@ class PCIQuirk:
                 self.pci_perm_dev_config = pci_perm_dev_config
             except Exception, ex:
                 raise XendError("Reading config file %s: %s" %
-                               (PERMISSIVE_CONFIG_FILE,str(ex)))
+                                (PERMISSIVE_CONFIG_FILE,str(ex)))
         else:
             log.info("Config file does not exist: %s" % PERMISSIVE_CONFIG_FILE)
             self.pci_perm_dev_config = ['xend-pci-perm-devs']
 
         devices = child_at(child(pci_perm_dev_config, 
'unconstrained_dev_ids'),0)
-       if self.__matchPCIdev( devices ):
+        if self.__matchPCIdev( devices ):
             log.debug("Permissive mode enabled for PCI device [%s]" %
                       self.devid)
             return True
@@ -133,7 +133,7 @@ class PCIQuirk:
         return False
 
     def __sendPermDevs(self):
-       if self.__devIsUnconstrained( ):
+        if self.__devIsUnconstrained( ):
             log.debug("Unconstrained device: %04x:%02x:%02x.%1x" %
                       (self.domain, self.bus, self.slot, self.func))
             try:
diff -r a34ab3f899c4 -r 7869f58ff551 tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py       Fri Mar 23 11:04:51 2007 +0000
+++ b/tools/python/xen/xm/main.py       Fri Mar 23 11:11:41 2007 +0000
@@ -732,7 +732,7 @@ def getDomains(domain_names, state, full
                             'state':    state_str,
                             'cpu_time': dom_metrics['VCPUs_utilisation'],
                             'start_time': dom_metrics['start_time']})
-                       
+
             doms_sxp.append(['domain'] + map2sxp(dom_rec))
             doms_dict.append(dom_rec)
             
diff -r a34ab3f899c4 -r 7869f58ff551 tools/xenmon/xenmon.py
--- a/tools/xenmon/xenmon.py    Fri Mar 23 11:04:51 2007 +0000
+++ b/tools/xenmon/xenmon.py    Fri Mar 23 11:11:41 2007 +0000
@@ -166,7 +166,7 @@ class DomainInfo:
 
     def ec_stats(self, passed):
         total = float(self.exec_count/(float(passed)/10**9))
-       return total
+        return total
 
     def io_stats(self, passed):
         total = float(self.iocount_sum)
@@ -235,7 +235,7 @@ def time_scale(ns):
     elif ns < 1000*1000:
         return "%4.2f us" % (float(ns)/10**3)
     elif ns < 10**9:
-           return "%4.2f ms" % (float(ns)/10**6)
+        return "%4.2f ms" % (float(ns)/10**6)
     else:
         return "%4.2f s" % (float(ns)/10**9)
 
@@ -534,20 +534,20 @@ def show_livestats(cpu):
 # write does the file get created
 class Delayed(file):
     def __init__(self, filename, mode):
-       self.filename = filename
-       self.saved_mode = mode
-       self.delay_data = ""
-       self.opened = 0
+        self.filename = filename
+        self.saved_mode = mode
+        self.delay_data = ""
+        self.opened = 0
 
     def delayed_write(self, str):
-       self.delay_data = str
+        self.delay_data = str
 
     def write(self, str):
-       if not self.opened:
-           self.file = open(self.filename, self.saved_mode)
-           self.opened = 1
+        if not self.opened:
+            self.file = open(self.filename, self.saved_mode)
+            self.opened = 1
             self.file.write(self.delay_data)
-       self.file.write(str)
+        self.file.write(str)
 
     def rename(self, name):
         self.filename = name
diff -r a34ab3f899c4 -r 7869f58ff551 tools/xm-test/lib/XmTestLib/NetConfig.py
--- a/tools/xm-test/lib/XmTestLib/NetConfig.py  Fri Mar 23 11:04:51 2007 +0000
+++ b/tools/xm-test/lib/XmTestLib/NetConfig.py  Fri Mar 23 11:11:41 2007 +0000
@@ -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 -r a34ab3f899c4 -r 7869f58ff551 tools/xm-test/lib/XmTestLib/XenDevice.py
--- a/tools/xm-test/lib/XmTestLib/XenDevice.py  Fri Mar 23 11:04:51 2007 +0000
+++ b/tools/xm-test/lib/XmTestLib/XenDevice.py  Fri Mar 23 11:11:41 2007 +0000
@@ -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 -r a34ab3f899c4 -r 7869f58ff551 tools/xm-test/lib/XmTestLib/arch.py
--- a/tools/xm-test/lib/XmTestLib/arch.py       Fri Mar 23 11:04:51 2007 +0000
+++ b/tools/xm-test/lib/XmTestLib/arch.py       Fri Mar 23 11:11:41 2007 +0000
@@ -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 -r a34ab3f899c4 -r 7869f58ff551 tools/xm-test/lib/XmTestReport/OSReport.py
--- a/tools/xm-test/lib/XmTestReport/OSReport.py        Fri Mar 23 11:04:51 
2007 +0000
+++ b/tools/xm-test/lib/XmTestReport/OSReport.py        Fri Mar 23 11:11:41 
2007 +0000
@@ -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 not rFile:
-           return None, None
-
-       line = rFile.readline()
-       return "Debian", line.rstrip("\n");
+        if os.access("/etc/debian_version", os.R_OK):
+            rFile = file("/etc/debian_version")
+        else:
+            rFile = None
+
+        if not rFile:
+            return None, None
+
+        line = rFile.readline()
+        return "Debian", line.rstrip("\n");
 
     def __lsbStyleRelease(self):
         if os.access("/etc/lsb-release", os.R_OK):
diff -r a34ab3f899c4 -r 7869f58ff551 tools/xm-test/lib/XmTestReport/Report.py
--- a/tools/xm-test/lib/XmTestReport/Report.py  Fri Mar 23 11:04:51 2007 +0000
+++ b/tools/xm-test/lib/XmTestReport/Report.py  Fri Mar 23 11:11:41 2007 +0000
@@ -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 -r a34ab3f899c4 -r 7869f58ff551 
tools/xm-test/tests/create/04_create_conflictname_neg.py
--- a/tools/xm-test/tests/create/04_create_conflictname_neg.py  Fri Mar 23 
11:04:51 2007 +0000
+++ b/tools/xm-test/tests/create/04_create_conflictname_neg.py  Fri Mar 23 
11:11:41 2007 +0000
@@ -34,8 +34,8 @@ except DomainError, e:
 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 -r a34ab3f899c4 -r 7869f58ff551 
tools/xm-test/tests/create/06_create_mem_neg.py
--- a/tools/xm-test/tests/create/06_create_mem_neg.py   Fri Mar 23 11:04:51 
2007 +0000
+++ b/tools/xm-test/tests/create/06_create_mem_neg.py   Fri Mar 23 11:11:41 
2007 +0000
@@ -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 -r a34ab3f899c4 -r 7869f58ff551 
tools/xm-test/tests/create/07_create_mem64_pos.py
--- a/tools/xm-test/tests/create/07_create_mem64_pos.py Fri Mar 23 11:04:51 
2007 +0000
+++ b/tools/xm-test/tests/create/07_create_mem64_pos.py Fri Mar 23 11:11:41 
2007 +0000
@@ -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 -r a34ab3f899c4 -r 7869f58ff551 
tools/xm-test/tests/create/08_create_mem128_pos.py
--- a/tools/xm-test/tests/create/08_create_mem128_pos.py        Fri Mar 23 
11:04:51 2007 +0000
+++ b/tools/xm-test/tests/create/08_create_mem128_pos.py        Fri Mar 23 
11:11:41 2007 +0000
@@ -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 -r a34ab3f899c4 -r 7869f58ff551 
tools/xm-test/tests/create/09_create_mem256_pos.py
--- a/tools/xm-test/tests/create/09_create_mem256_pos.py        Fri Mar 23 
11:04:51 2007 +0000
+++ b/tools/xm-test/tests/create/09_create_mem256_pos.py        Fri Mar 23 
11:11:41 2007 +0000
@@ -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 -r a34ab3f899c4 -r 7869f58ff551 
tools/xm-test/tests/migrate/01_migrate_localhost_pos.py
--- a/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py   Fri Mar 23 
11:04:51 2007 +0000
+++ b/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py   Fri Mar 23 
11:11:41 2007 +0000
@@ -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 -r a34ab3f899c4 -r 7869f58ff551 
tools/xm-test/tests/network-attach/04_network_attach_baddomain_neg.py
--- a/tools/xm-test/tests/network-attach/04_network_attach_baddomain_neg.py     
Fri Mar 23 11:04:51 2007 +0000
+++ b/tools/xm-test/tests/network-attach/04_network_attach_baddomain_neg.py     
Fri Mar 23 11:11:41 2007 +0000
@@ -10,6 +10,6 @@ eyecatcher = "Error"
 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 -r a34ab3f899c4 -r 7869f58ff551 
tools/xm-test/tests/network-attach/network_utils.py
--- a/tools/xm-test/tests/network-attach/network_utils.py       Fri Mar 23 
11:04:51 2007 +0000
+++ b/tools/xm-test/tests/network-attach/network_utils.py       Fri Mar 23 
11:11:41 2007 +0000
@@ -51,6 +51,6 @@ def network_detach(domain_name, console,
 
     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 -r a34ab3f899c4 -r 7869f58ff551 
tools/xm-test/tests/pause/01_pause_basic_pos.py
--- a/tools/xm-test/tests/pause/01_pause_basic_pos.py   Fri Mar 23 11:04:51 
2007 +0000
+++ b/tools/xm-test/tests/pause/01_pause_basic_pos.py   Fri Mar 23 11:11:41 
2007 +0000
@@ -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 -r a34ab3f899c4 -r 7869f58ff551 
tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py
--- a/tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py      
Fri Mar 23 11:04:51 2007 +0000
+++ b/tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py      
Fri Mar 23 11:11:41 2007 +0000
@@ -46,9 +46,9 @@ block_utils.block_attach(domain, resourc
 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 -r a34ab3f899c4 -r 7869f58ff551 
tools/xm-test/tests/unpause/01_unpause_basic_pos.py
--- a/tools/xm-test/tests/unpause/01_unpause_basic_pos.py       Fri Mar 23 
11:04:51 2007 +0000
+++ b/tools/xm-test/tests/unpause/01_unpause_basic_pos.py       Fri Mar 23 
11:11:41 2007 +0000
@@ -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 -r a34ab3f899c4 -r 7869f58ff551 
tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py
--- a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py      Fri Mar 23 11:04:51 
2007 +0000
+++ b/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py      Fri Mar 23 11:11:41 
2007 +0000
@@ -49,4 +49,4 @@ vtpm_cleanup(domName)
 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 -r a34ab3f899c4 -r 7869f58ff551 
tools/xm-test/tests/vtpm/03_vtpm-susp_res.py
--- a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py      Fri Mar 23 11:04:51 
2007 +0000
+++ b/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py      Fri Mar 23 11:11:41 
2007 +0000
@@ -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 -r a34ab3f899c4 -r 7869f58ff551 
tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py
--- a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py      Fri Mar 23 11:04:51 
2007 +0000
+++ b/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py      Fri Mar 23 11:11:41 
2007 +0000
@@ -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 -r a34ab3f899c4 -r 7869f58ff551 
tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py
--- a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py      Fri Mar 23 11:04:51 
2007 +0000
+++ b/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py      Fri Mar 23 11:11:41 
2007 +0000
@@ -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 -r a34ab3f899c4 -r 7869f58ff551 
tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py
--- a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py Fri Mar 23 11:04:51 
2007 +0000
+++ b/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py Fri Mar 23 11:11:41 
2007 +0000
@@ -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 -r a34ab3f899c4 -r 7869f58ff551 
tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py
--- a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py      Fri Mar 23 11:04:51 
2007 +0000
+++ b/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py      Fri Mar 23 11:11:41 
2007 +0000
@@ -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 -r a34ab3f899c4 -r 7869f58ff551 
tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py
--- a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py      Fri Mar 23 11:04:51 
2007 +0000
+++ b/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py      Fri Mar 23 11:11:41 
2007 +0000
@@ -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
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>