]> code.ossystems Code Review - openembedded-core.git/commitdiff
oeqa/utils: replace some tabs with spaces
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Tue, 23 Dec 2014 14:34:29 +0000 (14:34 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 25 Dec 2014 08:26:01 +0000 (08:26 +0000)
Python code should use spaces only for indentation.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
meta/lib/oeqa/utils/commands.py
meta/lib/oeqa/utils/decorators.py

index d29c1b1a68aa92973e677f112fdb36f17cc018f9..5b601d980644fad2a34cbe1d7640f5ad6ea64669 100644 (file)
@@ -110,11 +110,11 @@ def runCmd(command, ignore_status=False, timeout=None, assert_error=True, **opti
 def bitbake(command, ignore_status=False, timeout=None, postconfig=None, **options):
 
     if postconfig:
-       postconfig_file = os.path.join(os.environ.get('BUILDDIR'), 'oeqa-post.conf')
-       ftools.write_file(postconfig_file, postconfig)
-       extra_args = "-R %s" % postconfig_file
+        postconfig_file = os.path.join(os.environ.get('BUILDDIR'), 'oeqa-post.conf')
+        ftools.write_file(postconfig_file, postconfig)
+        extra_args = "-R %s" % postconfig_file
     else:
-       extra_args = ""
+        extra_args = ""
 
     if isinstance(command, basestring):
         cmd = "bitbake " + extra_args + " " + command
@@ -122,7 +122,7 @@ def bitbake(command, ignore_status=False, timeout=None, postconfig=None, **optio
         cmd = [ "bitbake" ] + [a for a in (command + extra_args.split(" ")) if a not in [""]]
 
     try:
-       return runCmd(cmd, ignore_status, timeout, **options)
+        return runCmd(cmd, ignore_status, timeout, **options)
     finally:
         if postconfig:
             os.remove(postconfig_file)
index 7f845dbb4b983f2389a43c900e629c0ad8fffdb8..1ae1162e33bf854f85bf36cdbb239080a5bcb9bc 100644 (file)
@@ -86,14 +86,14 @@ class testcase(object):
         self.test_case = test_case
 
     def __call__(self, func):
-       def wrapped_f(*args):
-               return func(*args)
-       wrapped_f.test_case = self.test_case
-       return wrapped_f
+        def wrapped_f(*args):
+            return func(*args)
+        wrapped_f.test_case = self.test_case
+        return wrapped_f
 
 class NoParsingFilter(logging.Filter):
     def filter(self, record):
-       return record.levelno == 100
+        return record.levelno == 100
 
 def LogResults(original_class):
     orig_method = original_class.run
@@ -101,51 +101,51 @@ def LogResults(original_class):
     #rewrite the run method of unittest.TestCase to add testcase logging
     def run(self, result, *args, **kws):
         orig_method(self, result, *args, **kws)
-       passed = True
-       testMethod = getattr(self, self._testMethodName)
-
-       #if test case is decorated then use it's number, else use it's name
-       try:
-               test_case = testMethod.test_case
-       except AttributeError:
-               test_case = self._testMethodName
-
-       #create custom logging level for filtering.
-       custom_log_level = 100
-       logging.addLevelName(custom_log_level, 'RESULTS')
-       caller = os.path.basename(sys.argv[0])
-
-       def results(self, message, *args, **kws):
-           if self.isEnabledFor(custom_log_level):
-               self.log(custom_log_level, message, *args, **kws)
-       logging.Logger.results = results
-
-       logging.basicConfig(filename=os.path.join(os.getcwd(),'results-'+caller+'.log'),
+        passed = True
+        testMethod = getattr(self, self._testMethodName)
+
+        #if test case is decorated then use it's number, else use it's name
+        try:
+            test_case = testMethod.test_case
+        except AttributeError:
+            test_case = self._testMethodName
+
+        #create custom logging level for filtering.
+        custom_log_level = 100
+        logging.addLevelName(custom_log_level, 'RESULTS')
+        caller = os.path.basename(sys.argv[0])
+
+        def results(self, message, *args, **kws):
+            if self.isEnabledFor(custom_log_level):
+                self.log(custom_log_level, message, *args, **kws)
+        logging.Logger.results = results
+
+        logging.basicConfig(filename=os.path.join(os.getcwd(),'results-'+caller+'.log'),
                             filemode='w',
                             format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
                             datefmt='%H:%M:%S',
                             level=custom_log_level)
-       for handler in logging.root.handlers:
-               handler.addFilter(NoParsingFilter())
-       local_log = logging.getLogger(caller)
+        for handler in logging.root.handlers:
+            handler.addFilter(NoParsingFilter())
+        local_log = logging.getLogger(caller)
 
-       #check status of tests and record it
+        #check status of tests and record it
         for (name, msg) in result.errors:
-                if self._testMethodName == str(name).split(' ')[0]:
-                       local_log.results("Testcase "+str(test_case)+": ERROR")
-                       local_log.results("Testcase "+str(test_case)+":\n"+msg)
-                       passed = False
+            if self._testMethodName == str(name).split(' ')[0]:
+                local_log.results("Testcase "+str(test_case)+": ERROR")
+                local_log.results("Testcase "+str(test_case)+":\n"+msg)
+                passed = False
         for (name, msg) in result.failures:
-                if self._testMethodName == str(name).split(' ')[0]:
-                       local_log.results("Testcase "+str(test_case)+": FAILED")
-                       local_log.results("Testcase "+str(test_case)+":\n"+msg)
-                       passed = False
+            if self._testMethodName == str(name).split(' ')[0]:
+                local_log.results("Testcase "+str(test_case)+": FAILED")
+                local_log.results("Testcase "+str(test_case)+":\n"+msg)
+                passed = False
         for (name, msg) in result.skipped:
-                if self._testMethodName == str(name).split(' ')[0]:
-                       local_log.results("Testcase "+str(test_case)+": SKIPPED")
-                       passed = False
-       if passed:
-                       local_log.results("Testcase "+str(test_case)+": PASSED")
+            if self._testMethodName == str(name).split(' ')[0]:
+                local_log.results("Testcase "+str(test_case)+": SKIPPED")
+                passed = False
+        if passed:
+            local_log.results("Testcase "+str(test_case)+": PASSED")
 
     original_class.run = run
     return original_class