ia64/xen-unstable

changeset 14531:7869f58ff551

Replace tabs with spaces.

Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
author Ewan Mellor <ewan@xensource.com>
date Fri Mar 23 11:11:41 2007 +0000 (2007-03-23)
parents a34ab3f899c4
children ac5c0a100868
files tools/python/xen/xend/server/SrvDomain.py tools/python/xen/xend/server/pciquirk.py tools/python/xen/xm/main.py tools/xenmon/xenmon.py tools/xm-test/lib/XmTestLib/NetConfig.py tools/xm-test/lib/XmTestLib/XenDevice.py tools/xm-test/lib/XmTestLib/arch.py tools/xm-test/lib/XmTestReport/OSReport.py tools/xm-test/lib/XmTestReport/Report.py tools/xm-test/tests/create/04_create_conflictname_neg.py tools/xm-test/tests/create/06_create_mem_neg.py tools/xm-test/tests/create/07_create_mem64_pos.py tools/xm-test/tests/create/08_create_mem128_pos.py tools/xm-test/tests/create/09_create_mem256_pos.py tools/xm-test/tests/migrate/01_migrate_localhost_pos.py tools/xm-test/tests/network-attach/04_network_attach_baddomain_neg.py tools/xm-test/tests/network-attach/network_utils.py tools/xm-test/tests/pause/01_pause_basic_pos.py tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py tools/xm-test/tests/unpause/01_unpause_basic_pos.py tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py tools/xm-test/tests/vtpm/03_vtpm-susp_res.py tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py
line diff
     1.1 --- a/tools/python/xen/xend/server/SrvDomain.py	Fri Mar 23 11:04:51 2007 +0000
     1.2 +++ b/tools/python/xen/xend/server/SrvDomain.py	Fri Mar 23 11:11:41 2007 +0000
     1.3 @@ -101,10 +101,10 @@ class SrvDomain(SrvDir):
     1.4  
     1.5      def do_dump(self, _, req):
     1.6          fn = FormFn(self.xd.domain_dump,
     1.7 -	            [['dom',         'int'],
     1.8 -		     ['file',        'str'],
     1.9 -		     ['live',        'int'],
    1.10 -		     ['crash',       'int']])
    1.11 +                    [['dom',         'int'],
    1.12 +                     ['file',        'str'],
    1.13 +                     ['live',        'int'],
    1.14 +                     ['crash',       'int']])
    1.15          return fn(req.args, {'dom': self.dom.domid})
    1.16  
    1.17      def op_migrate(self, op, req):
    1.18 @@ -139,9 +139,9 @@ class SrvDomain(SrvDir):
    1.19                      [['dom', 'int'],
    1.20                       ['period', 'int'],
    1.21                       ['slice', 'int'],
    1.22 -		     ['latency', 'int'],
    1.23 -		     ['extratime', 'int'],
    1.24 -		     ['weight', 'int']])
    1.25 +                     ['latency', 'int'],
    1.26 +                     ['extratime', 'int'],
    1.27 +                     ['weight', 'int']])
    1.28          val = fn(req.args, {'dom': self.dom.domid})
    1.29          return val
    1.30      
     2.1 --- a/tools/python/xen/xend/server/pciquirk.py	Fri Mar 23 11:04:51 2007 +0000
     2.2 +++ b/tools/python/xen/xend/server/pciquirk.py	Fri Mar 23 11:11:41 2007 +0000
     2.3 @@ -74,7 +74,7 @@ class PCIQuirk:
     2.4                  self.pci_quirks_config = pci_quirks_config
     2.5              except Exception, ex:
     2.6                  raise XendError("Reading config file %s: %s" %
     2.7 -				(QUIRK_CONFIG_FILE, str(ex)))
     2.8 +                                (QUIRK_CONFIG_FILE, str(ex)))
     2.9          else:
    2.10              log.info("Config file does not exist: %s" % QUIRK_CONFIG_FILE)
    2.11              self.pci_quirks_config = ['xend-pci-quirks']
    2.12 @@ -83,7 +83,7 @@ class PCIQuirk:
    2.13          for dev in devices:
    2.14              ids = child_at(child(dev,'pci_ids'),0)
    2.15              fields = child_at(child(dev,'pci_config_space_fields'),0)
    2.16 -	    if self.__matchPCIdev( ids ):
    2.17 +            if self.__matchPCIdev( ids ):
    2.18                  log.info("Quirks found for PCI device [%s]" % self.devid)
    2.19                  return fields
    2.20  
    2.21 @@ -93,11 +93,11 @@ class PCIQuirk:
    2.22      def __sendQuirks(self):
    2.23          for quirk in self.quirks:
    2.24              log.debug("Quirk Info: %04x:%02x:%02x.%1x-%s" % (self.domain,
    2.25 -		    self.bus, self.slot, self.func, quirk))
    2.26 +                      self.bus, self.slot, self.func, quirk))
    2.27              try:
    2.28                  f = file(QUIRK_SYSFS_NODE ,"w")
    2.29                  f.write( "%04x:%02x:%02x.%1x-%s" % (self.domain, self.bus,
    2.30 -			self.slot, self.func, quirk) )
    2.31 +                        self.slot, self.func, quirk) )
    2.32                  f.close()
    2.33              except Exception, e:
    2.34                  raise VmError("pci: failed to open/write/close quirks " +
    2.35 @@ -118,13 +118,13 @@ class PCIQuirk:
    2.36                  self.pci_perm_dev_config = pci_perm_dev_config
    2.37              except Exception, ex:
    2.38                  raise XendError("Reading config file %s: %s" %
    2.39 -				(PERMISSIVE_CONFIG_FILE,str(ex)))
    2.40 +                                (PERMISSIVE_CONFIG_FILE,str(ex)))
    2.41          else:
    2.42              log.info("Config file does not exist: %s" % PERMISSIVE_CONFIG_FILE)
    2.43              self.pci_perm_dev_config = ['xend-pci-perm-devs']
    2.44  
    2.45          devices = child_at(child(pci_perm_dev_config, 'unconstrained_dev_ids'),0)
    2.46 -	if self.__matchPCIdev( devices ):
    2.47 +        if self.__matchPCIdev( devices ):
    2.48              log.debug("Permissive mode enabled for PCI device [%s]" %
    2.49                        self.devid)
    2.50              return True
    2.51 @@ -133,7 +133,7 @@ class PCIQuirk:
    2.52          return False
    2.53  
    2.54      def __sendPermDevs(self):
    2.55 -	if self.__devIsUnconstrained( ):
    2.56 +        if self.__devIsUnconstrained( ):
    2.57              log.debug("Unconstrained device: %04x:%02x:%02x.%1x" %
    2.58                        (self.domain, self.bus, self.slot, self.func))
    2.59              try:
     3.1 --- a/tools/python/xen/xm/main.py	Fri Mar 23 11:04:51 2007 +0000
     3.2 +++ b/tools/python/xen/xm/main.py	Fri Mar 23 11:11:41 2007 +0000
     3.3 @@ -732,7 +732,7 @@ def getDomains(domain_names, state, full
     3.4                              'state':    state_str,
     3.5                              'cpu_time': dom_metrics['VCPUs_utilisation'],
     3.6                              'start_time': dom_metrics['start_time']})
     3.7 -			
     3.8 +
     3.9              doms_sxp.append(['domain'] + map2sxp(dom_rec))
    3.10              doms_dict.append(dom_rec)
    3.11              
     4.1 --- a/tools/xenmon/xenmon.py	Fri Mar 23 11:04:51 2007 +0000
     4.2 +++ b/tools/xenmon/xenmon.py	Fri Mar 23 11:11:41 2007 +0000
     4.3 @@ -166,7 +166,7 @@ class DomainInfo:
     4.4  
     4.5      def ec_stats(self, passed):
     4.6          total = float(self.exec_count/(float(passed)/10**9))
     4.7 -	return total
     4.8 +        return total
     4.9  
    4.10      def io_stats(self, passed):
    4.11          total = float(self.iocount_sum)
    4.12 @@ -235,7 +235,7 @@ def time_scale(ns):
    4.13      elif ns < 1000*1000:
    4.14          return "%4.2f us" % (float(ns)/10**3)
    4.15      elif ns < 10**9:
    4.16 -	    return "%4.2f ms" % (float(ns)/10**6)
    4.17 +        return "%4.2f ms" % (float(ns)/10**6)
    4.18      else:
    4.19          return "%4.2f s" % (float(ns)/10**9)
    4.20  
    4.21 @@ -534,20 +534,20 @@ def show_livestats(cpu):
    4.22  # write does the file get created
    4.23  class Delayed(file):
    4.24      def __init__(self, filename, mode):
    4.25 -	self.filename = filename
    4.26 -	self.saved_mode = mode
    4.27 -	self.delay_data = ""
    4.28 -	self.opened = 0
    4.29 +        self.filename = filename
    4.30 +        self.saved_mode = mode
    4.31 +        self.delay_data = ""
    4.32 +        self.opened = 0
    4.33  
    4.34      def delayed_write(self, str):
    4.35 -	self.delay_data = str
    4.36 +        self.delay_data = str
    4.37  
    4.38      def write(self, str):
    4.39 -	if not self.opened:
    4.40 -	    self.file = open(self.filename, self.saved_mode)
    4.41 -	    self.opened = 1
    4.42 +        if not self.opened:
    4.43 +            self.file = open(self.filename, self.saved_mode)
    4.44 +            self.opened = 1
    4.45              self.file.write(self.delay_data)
    4.46 -	self.file.write(str)
    4.47 +        self.file.write(str)
    4.48  
    4.49      def rename(self, name):
    4.50          self.filename = name
     5.1 --- a/tools/xm-test/lib/XmTestLib/NetConfig.py	Fri Mar 23 11:04:51 2007 +0000
     5.2 +++ b/tools/xm-test/lib/XmTestLib/NetConfig.py	Fri Mar 23 11:11:41 2007 +0000
     5.3 @@ -87,7 +87,7 @@ class NetConfig:
     5.4          else:
     5.5              self.netmask = NETMASK
     5.6              self.network = NETWORK
     5.7 -	    s_ip = ''
     5.8 +            s_ip = ''
     5.9  
    5.10              # Get starting ip and max ip from configured ip range
    5.11              s_ip = NETWORK_IP_RANGE
     6.1 --- a/tools/xm-test/lib/XmTestLib/XenDevice.py	Fri Mar 23 11:04:51 2007 +0000
     6.2 +++ b/tools/xm-test/lib/XmTestLib/XenDevice.py	Fri Mar 23 11:11:41 2007 +0000
     6.3 @@ -98,8 +98,8 @@ class XenDevice:
     6.4          self.domain = domain
     6.5          self.configNode = None
     6.6          # Commands run when domain is started or devices added and removed.
     6.7 -	self.dom0_cmds = []
     6.8 -	self.domU_cmds = []
     6.9 +        self.dom0_cmds = []
    6.10 +        self.domU_cmds = []
    6.11  
    6.12      def __str__(self):
    6.13          """Convert device config to XenConfig node compatible string"""
    6.14 @@ -178,7 +178,7 @@ class XenNetDevice(XenDevice):
    6.15          self.dom0_alias_ip = None
    6.16  
    6.17          if domain.getDomainType() == "HVM":
    6.18 -	    self.config["type"] = "ioemu"
    6.19 +            self.config["type"] = "ioemu"
    6.20              if not self.config.has_key('bridge'):
    6.21                  self.config["bridge"] = "xenbr0"
    6.22  
    6.23 @@ -252,7 +252,7 @@ class XenNetDevice(XenDevice):
    6.24          if (self.ip and not ip) or ((self.ip and ip) and (self.ip != ip)): 
    6.25              self.releaseNetDevIP()
    6.26  
    6.27 -	if not self.netmask:
    6.28 +        if not self.netmask:
    6.29              self.netmask = xmtest_netconf.getNetMask()
    6.30  
    6.31          if not self.network:
     7.1 --- a/tools/xm-test/lib/XmTestLib/arch.py	Fri Mar 23 11:04:51 2007 +0000
     7.2 +++ b/tools/xm-test/lib/XmTestLib/arch.py	Fri Mar 23 11:11:41 2007 +0000
     7.3 @@ -94,7 +94,7 @@ def ppc_checkBuffer(buffer):
     7.4      for i in range(0, len(checks)):
     7.5          check=checks[i]
     7.6          if check.get('pattern').search(buffer):
     7.7 -		FAIL(check.get('message'))
     7.8 +            FAIL(check.get('message'))
     7.9  
    7.10      return
    7.11  
     8.1 --- a/tools/xm-test/lib/XmTestReport/OSReport.py	Fri Mar 23 11:04:51 2007 +0000
     8.2 +++ b/tools/xm-test/lib/XmTestReport/OSReport.py	Fri Mar 23 11:11:41 2007 +0000
     8.3 @@ -149,16 +149,16 @@ class OperatingSystem:
     8.4              return None, None
     8.5  
     8.6      def __debianStyleRelease(self):
     8.7 -	if os.access("/etc/debian_version", os.R_OK):
     8.8 -	    rFile = file("/etc/debian_version")
     8.9 -	else:
    8.10 -	    rFile = None
    8.11 +        if os.access("/etc/debian_version", os.R_OK):
    8.12 +            rFile = file("/etc/debian_version")
    8.13 +        else:
    8.14 +            rFile = None
    8.15  
    8.16 -	if not rFile:
    8.17 -	    return None, None
    8.18 +        if not rFile:
    8.19 +            return None, None
    8.20  
    8.21 -	line = rFile.readline()
    8.22 -	return "Debian", line.rstrip("\n");
    8.23 +        line = rFile.readline()
    8.24 +        return "Debian", line.rstrip("\n");
    8.25  
    8.26      def __lsbStyleRelease(self):
    8.27          if os.access("/etc/lsb-release", os.R_OK):
     9.1 --- a/tools/xm-test/lib/XmTestReport/Report.py	Fri Mar 23 11:04:51 2007 +0000
     9.2 +++ b/tools/xm-test/lib/XmTestReport/Report.py	Fri Mar 23 11:11:41 2007 +0000
     9.3 @@ -86,7 +86,7 @@ def encodeForm(fieldList):
     9.4  
     9.5  def postResults(report_server, results):
     9.6      if not re.match('http://', report_server):
     9.7 -	report_server = 'http://'+report_server
     9.8 +        report_server = 'http://'+report_server
     9.9      (report_host,report_url) = urlparse(report_server)[1:3]
    9.10      conn = httplib.HTTPConnection(report_host)
    9.11  
    10.1 --- a/tools/xm-test/tests/create/04_create_conflictname_neg.py	Fri Mar 23 11:04:51 2007 +0000
    10.2 +++ b/tools/xm-test/tests/create/04_create_conflictname_neg.py	Fri Mar 23 11:11:41 2007 +0000
    10.3 @@ -34,8 +34,8 @@ try:
    10.4  except DomainError, e:
    10.5      eyecatcher = "Fail"
    10.6      # Stop the domain1 (nice shutdown)
    10.7 -    domain1.stop()	
    10.8 +    domain1.stop()
    10.9  
   10.10  if eyecatcher != "Fail":
   10.11 -	domain2.stop()
   10.12 -	FAIL("xm create let me create a duplicate-named domain!") 
   10.13 +    domain2.stop()
   10.14 +    FAIL("xm create let me create a duplicate-named domain!") 
    11.1 --- a/tools/xm-test/tests/create/06_create_mem_neg.py	Fri Mar 23 11:04:51 2007 +0000
    11.2 +++ b/tools/xm-test/tests/create/06_create_mem_neg.py	Fri Mar 23 11:11:41 2007 +0000
    11.3 @@ -16,7 +16,7 @@ from XmTestLib import *
    11.4  
    11.5  rdpath = os.environ.get("RD_PATH")
    11.6  if not rdpath:
    11.7 -	rdpath = "../ramdisk"
    11.8 +    rdpath = "../ramdisk"
    11.9  
   11.10  # Test 1: create a domain with mem=0
   11.11  config1 = {"memory": 0}
   11.12 @@ -29,8 +29,8 @@ except DomainError, e:
   11.13      eyecatcher1 = "Fail"
   11.14  
   11.15  if eyecatcher1 != "Fail":
   11.16 -	domain1.stop()
   11.17 -        FAIL("xm create let me create a domain with 0 memory")
   11.18 +    domain1.stop()
   11.19 +    FAIL("xm create let me create a domain with 0 memory")
   11.20  
   11.21  
   11.22  # Test 2: create a domain with mem>sys_mem
   11.23 @@ -48,6 +48,6 @@ except DomainError, e:
   11.24      eyecatcher2 = "Fail"
   11.25  
   11.26  if eyecatcher2 != "Fail":
   11.27 -        domain2.stop()
   11.28 -        FAIL("xm create let me create a domain with mem > sys_mem")
   11.29 +    domain2.stop()
   11.30 +    FAIL("xm create let me create a domain with mem > sys_mem")
   11.31  
    12.1 --- a/tools/xm-test/tests/create/07_create_mem64_pos.py	Fri Mar 23 11:04:51 2007 +0000
    12.2 +++ b/tools/xm-test/tests/create/07_create_mem64_pos.py	Fri Mar 23 11:11:41 2007 +0000
    12.3 @@ -15,12 +15,12 @@ from XmTestLib import *
    12.4  
    12.5  rdpath = os.environ.get("RD_PATH")
    12.6  if not rdpath:
    12.7 -        rdpath = "../ramdisk"
    12.8 +    rdpath = "../ramdisk"
    12.9  
   12.10  #get current free memory info
   12.11  mem = int(getInfo("free_memory"))
   12.12  if mem < 64:
   12.13 -	SKIP("This test needs 64 MB of free memory (%i MB avail)" % mem)
   12.14 +    SKIP("This test needs 64 MB of free memory (%i MB avail)" % mem)
   12.15  
   12.16  #create a domain with mem=64
   12.17  config = {"memory": 64}
   12.18 @@ -39,11 +39,11 @@ except DomainError, e:
   12.19  
   12.20  eyecatcher1 = str(isDomainRunning(domain_mem64.getName()))
   12.21  if eyecatcher1 != "True":
   12.22 -	FAIL("Failed to verify that a 64MB domain started")
   12.23 +    FAIL("Failed to verify that a 64MB domain started")
   12.24  
   12.25  eyecatcher2 = getDomMem(domain_mem64.getName())
   12.26  if eyecatcher2 not in range(62, 65):
   12.27 -	FAIL("Started domain with 64MB, but it got %i MB" % eyecatcher2)
   12.28 +    FAIL("Started domain with 64MB, but it got %i MB" % eyecatcher2)
   12.29  
   12.30  #stop the domain (nice shutdown)
   12.31  domain_mem64.stop()
    13.1 --- a/tools/xm-test/tests/create/08_create_mem128_pos.py	Fri Mar 23 11:04:51 2007 +0000
    13.2 +++ b/tools/xm-test/tests/create/08_create_mem128_pos.py	Fri Mar 23 11:11:41 2007 +0000
    13.3 @@ -15,12 +15,12 @@ from XmTestLib import *
    13.4  
    13.5  rdpath = os.environ.get("RD_PATH")
    13.6  if not rdpath:
    13.7 -        rdpath = "../ramdisk"
    13.8 +    rdpath = "../ramdisk"
    13.9  
   13.10  #get current free memory info
   13.11  mem = int(getInfo("free_memory"))
   13.12  if mem < 128:
   13.13 -        SKIP("This test needs 128 MB of free memory (%i MB avail)" % mem)
   13.14 +    SKIP("This test needs 128 MB of free memory (%i MB avail)" % mem)
   13.15  
   13.16  #create a domain with mem=128
   13.17  config={"memory": 128}
   13.18 @@ -39,11 +39,11 @@ except DomainError, e:
   13.19  
   13.20  eyecatcher1 = str(isDomainRunning(domain_mem128.getName()))
   13.21  if eyecatcher1 != "True":
   13.22 -	FAIL("Failed to verify that a 128MB domain started")
   13.23 +    FAIL("Failed to verify that a 128MB domain started")
   13.24  
   13.25  eyecatcher2 = getDomMem(domain_mem128.getName())
   13.26  if eyecatcher2 not in range(126, 129):
   13.27 -	FAIL("Started domain with 128MB, but it got %i MB" % eyecatcher2)
   13.28 +    FAIL("Started domain with 128MB, but it got %i MB" % eyecatcher2)
   13.29  
   13.30  #stop the domain (nice shutdown)
   13.31  domain_mem128.stop()
    14.1 --- a/tools/xm-test/tests/create/09_create_mem256_pos.py	Fri Mar 23 11:04:51 2007 +0000
    14.2 +++ b/tools/xm-test/tests/create/09_create_mem256_pos.py	Fri Mar 23 11:11:41 2007 +0000
    14.3 @@ -15,12 +15,12 @@ from XmTestLib import *
    14.4  
    14.5  rdpath = os.environ.get("RD_PATH")
    14.6  if not rdpath:
    14.7 -        rdpath = "../ramdisk"
    14.8 +    rdpath = "../ramdisk"
    14.9  
   14.10  #get current free memory info
   14.11  mem = int(getInfo("free_memory"))
   14.12  if mem < 256:
   14.13 -        SKIP("This test needs 256 MB of free memory (%i MB avail)" % mem)
   14.14 +    SKIP("This test needs 256 MB of free memory (%i MB avail)" % mem)
   14.15  
   14.16  #create a domain with mem=256
   14.17  config = {"memory": 256}
   14.18 @@ -39,11 +39,11 @@ except DomainError, e:
   14.19  
   14.20  eyecatcher1 = str(isDomainRunning(domain_mem256.getName()))
   14.21  if eyecatcher1 != "True":
   14.22 -	FAIL("Failed to verify that a 256MB domain started")
   14.23 +    FAIL("Failed to verify that a 256MB domain started")
   14.24  
   14.25  eyecatcher2 = getDomMem(domain_mem256.getName())
   14.26  if eyecatcher2 not in range(254, 257):
   14.27 -	FAIL("Started domain with 256MB, but it got %i MB" % eyecatcher2)
   14.28 +    FAIL("Started domain with 256MB, but it got %i MB" % eyecatcher2)
   14.29  
   14.30  #stop the domain (nice shutdown)
   14.31  domain_mem256.stop()
    15.1 --- a/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py	Fri Mar 23 11:04:51 2007 +0000
    15.2 +++ b/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py	Fri Mar 23 11:11:41 2007 +0000
    15.3 @@ -51,12 +51,12 @@ except TimeoutError, e:
    15.4      FAIL(str(e))
    15.5      
    15.6  if status != 0:
    15.7 -	FAIL("xm migrate returned invalid %i != 0" % status)
    15.8 +    FAIL("xm migrate returned invalid %i != 0" % status)
    15.9  
   15.10  new_domid = domid(domain.getName())
   15.11  
   15.12  if (old_domid == new_domid):
   15.13 -	FAIL("xm migrate failed, domain id is still %s" % old_domid)
   15.14 +    FAIL("xm migrate failed, domain id is still %s" % old_domid)
   15.15  
   15.16  # Attach a console to it
   15.17  try:
    16.1 --- a/tools/xm-test/tests/network-attach/04_network_attach_baddomain_neg.py	Fri Mar 23 11:04:51 2007 +0000
    16.2 +++ b/tools/xm-test/tests/network-attach/04_network_attach_baddomain_neg.py	Fri Mar 23 11:11:41 2007 +0000
    16.3 @@ -10,6 +10,6 @@ status, output = traceCommand("xm networ
    16.4  eyecatcher = "Error"
    16.5  where = output.find(eyecatcher)
    16.6  if status == 0:
    16.7 -	FAIL("xm network-attach returned bad status, expected non 0, status is: %i" % status )
    16.8 +    FAIL("xm network-attach returned bad status, expected non 0, status is: %i" % status )
    16.9  elif where == -1:
   16.10 -	FAIL("xm network-attach returned bad output, expected Error, output is: %s" % output )
   16.11 +    FAIL("xm network-attach returned bad output, expected Error, output is: %s" % output )
    17.1 --- a/tools/xm-test/tests/network-attach/network_utils.py	Fri Mar 23 11:04:51 2007 +0000
    17.2 +++ b/tools/xm-test/tests/network-attach/network_utils.py	Fri Mar 23 11:11:41 2007 +0000
    17.3 @@ -51,6 +51,6 @@ def network_detach(domain_name, console,
    17.4  
    17.5      eths_after = count_eth(console)
    17.6      if eths_after != (eths_before-1):
    17.7 -    	return -2, "Network device was not actually disconnected from domU"
    17.8 +        return -2, "Network device was not actually disconnected from domU"
    17.9  
   17.10      return 0, None
    18.1 --- a/tools/xm-test/tests/pause/01_pause_basic_pos.py	Fri Mar 23 11:04:51 2007 +0000
    18.2 +++ b/tools/xm-test/tests/pause/01_pause_basic_pos.py	Fri Mar 23 11:11:41 2007 +0000
    18.3 @@ -39,7 +39,7 @@ domain.closeConsole()
    18.4  # Pause the domain
    18.5  status, output = traceCommand("xm pause %s" % domain.getName())
    18.6  if status != 0:
    18.7 -	FAIL("xm pause returned invalid %i != 0", status)
    18.8 +    FAIL("xm pause returned invalid %i != 0", status)
    18.9  
   18.10  # Try to attach a console to it
   18.11  try:
   18.12 @@ -56,7 +56,7 @@ domain.closeConsole()
   18.13  
   18.14  status, output = traceCommand("xm unpause %s" % domain.getName())
   18.15  if status != 0:
   18.16 -	FAIL("xm unpause returned invalid %i != 0", status)
   18.17 +    FAIL("xm unpause returned invalid %i != 0", status)
   18.18  
   18.19  # Stop the domain (nice shutdown)
   18.20  domain.stop()
    19.1 --- a/tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py	Fri Mar 23 11:04:51 2007 +0000
    19.2 +++ b/tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py	Fri Mar 23 11:11:41 2007 +0000
    19.3 @@ -46,9 +46,9 @@ ACMLabelResource(resource1, resourcelabe
    19.4  block_utils.block_attach(domain, resource1, "xvda1")
    19.5  
    19.6  try:
    19.7 -	run1 = console.runCmd("cat /proc/partitions")
    19.8 +    run1 = console.runCmd("cat /proc/partitions")
    19.9  except ConsoleError, e:
   19.10 -	FAIL(str(e))
   19.11 +    FAIL(str(e))
   19.12  
   19.13  #Explicitly label the 2nd resource
   19.14  ACMLabelResource(resource2, resourcelabel2)
   19.15 @@ -62,9 +62,9 @@ for i in range(10):
   19.16      time.sleep(1)
   19.17  
   19.18  try:
   19.19 -	run2 = console.runCmd("cat /proc/partitions")
   19.20 +    run2 = console.runCmd("cat /proc/partitions")
   19.21  except ConsoleError, e:
   19.22 -	FAIL(str(e))
   19.23 +    FAIL(str(e))
   19.24  
   19.25  # Close the console
   19.26  domain.closeConsole()
    20.1 --- a/tools/xm-test/tests/unpause/01_unpause_basic_pos.py	Fri Mar 23 11:04:51 2007 +0000
    20.2 +++ b/tools/xm-test/tests/unpause/01_unpause_basic_pos.py	Fri Mar 23 11:11:41 2007 +0000
    20.3 @@ -46,18 +46,17 @@ for i in range(100):
    20.4          # Pause the domain
    20.5          status, output = traceCommand("xm pause %s" % domain.getName())
    20.6          if status != 0:
    20.7 -	        FAIL("xm pause returned invalid %i != 0", status)
    20.8 +            FAIL("xm pause returned invalid %i != 0", status)
    20.9      else:
   20.10          # Unpause the domain
   20.11          status, output = traceCommand("xm unpause %s" % domain.getName())
   20.12          if status != 0:
   20.13 -	        FAIL("xm unpause returned invalud %i != 0", status)
   20.14 -	
   20.15 +            FAIL("xm unpause returned invalud %i != 0", status)
   20.16  
   20.17  # Make sure the domain is unpaused before we finish up
   20.18  status, output = traceCommand("xm unpause %s" % domain.getName())
   20.19  if status != 0:
   20.20 -	FAIL("xm unpause returned invalid %i != 0", status)
   20.21 +    FAIL("xm unpause returned invalid %i != 0", status)
   20.22  
   20.23  # Are we still alive after all that?
   20.24  try:
    21.1 --- a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py	Fri Mar 23 11:04:51 2007 +0000
    21.2 +++ b/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py	Fri Mar 23 11:11:41 2007 +0000
    21.3 @@ -49,4 +49,4 @@ domain.stop()
    21.4  vtpm_cleanup(domName)
    21.5  
    21.6  if not re.search("PCR-00:",run["output"]):
    21.7 -	FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
    21.8 +    FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
    22.1 --- a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py	Fri Mar 23 11:04:51 2007 +0000
    22.2 +++ b/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py	Fri Mar 23 11:11:41 2007 +0000
    22.3 @@ -97,7 +97,7 @@ while loop < 3:
    22.4      if not re.search("PCR-00:",run["output"]):
    22.5          saveLog(console.getHistory())
    22.6          vtpm_cleanup(domName)
    22.7 -	FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
    22.8 +        FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
    22.9  
   22.10      loop += 1
   22.11  
    23.1 --- a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py	Fri Mar 23 11:04:51 2007 +0000
    23.2 +++ b/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py	Fri Mar 23 11:11:41 2007 +0000
    23.3 @@ -91,7 +91,7 @@ while loop < 3:
    23.4      if not re.search("PCR-00:",run["output"]):
    23.5          saveLog(console.getHistory())
    23.6          vtpm_cleanup(domName)
    23.7 -	FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
    23.8 +        FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
    23.9  
   23.10      loop += 1
   23.11  
    24.1 --- a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py	Fri Mar 23 11:04:51 2007 +0000
    24.2 +++ b/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py	Fri Mar 23 11:11:41 2007 +0000
    24.3 @@ -91,7 +91,7 @@ while loop < 3:
    24.4      if not re.search("PCR-00:",run["output"]):
    24.5          saveLog(console.getHistory())
    24.6          vtpm_cleanup(domName)
    24.7 -	FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
    24.8 +        FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
    24.9  
   24.10      loop += 1
   24.11  
    25.1 --- a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py	Fri Mar 23 11:04:51 2007 +0000
    25.2 +++ b/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py	Fri Mar 23 11:11:41 2007 +0000
    25.3 @@ -122,12 +122,12 @@ while loop < 3:
    25.4      if not re.search("PCR-00:",run["output"]):
    25.5          saveLog(console.getHistory())
    25.6          vtpm_cleanup(domName)
    25.7 -	FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
    25.8 +        FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
    25.9  
   25.10      if not re.search("PCR-00: 1E A7 BD",run["output"]):
   25.11          saveLog(console.getHistory())
   25.12          vtpm_cleanup(domName)
   25.13 -	FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"])
   25.14 +        FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"])
   25.15  
   25.16      loop += 1
   25.17  
    26.1 --- a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py	Fri Mar 23 11:04:51 2007 +0000
    26.2 +++ b/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py	Fri Mar 23 11:11:41 2007 +0000
    26.3 @@ -116,12 +116,12 @@ while loop < 3:
    26.4      if not re.search("PCR-00:",run["output"]):
    26.5          saveLog(console.getHistory())
    26.6          vtpm_cleanup(domName)
    26.7 -	FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
    26.8 +        FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
    26.9  
   26.10      if not re.search("PCR-00: 1E A7 BD",run["output"]):
   26.11          saveLog(console.getHistory())
   26.12          vtpm_cleanup(domName)
   26.13 -	FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"])
   26.14 +        FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"])
   26.15  
   26.16      loop += 1
   26.17  
    27.1 --- a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py	Fri Mar 23 11:04:51 2007 +0000
    27.2 +++ b/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py	Fri Mar 23 11:11:41 2007 +0000
    27.3 @@ -116,12 +116,12 @@ while loop < 3:
    27.4      if not re.search("PCR-00:",run["output"]):
    27.5          saveLog(console.getHistory())
    27.6          vtpm_cleanup(domName)
    27.7 -	FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
    27.8 +        FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
    27.9  
   27.10      if not re.search("PCR-00: 1E A7 BD",run["output"]):
   27.11          saveLog(console.getHistory())
   27.12          vtpm_cleanup(domName)
   27.13 -	FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"])
   27.14 +        FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"])
   27.15  
   27.16      loop += 1
   27.17