Reformatting

Signed-off-by: Daniel Madej <[email protected]>

Author: Deixx

common.py

@@ -1,5 +1,6 @@
 #
 # Copyright(c) 2023 Intel Corporation
+# Copyright(c) 2024 Huawei Technologies
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -10,9 +11,7 @@
 import hashlib
 import json
 import os
-import random
 import re
-import sys
 import time
 import yaml
 
@@ -173,7 +172,7 @@ def duration(self):
             start_time = self['start-timestamp']
             end_time = self.get('end-timestamp', time.time())
             return timedelta(seconds=int(end_time-start_time))
-        except:
+        except KeyError:
             return timedelta(0)
 
     def __eq__(self, other):
@@ -196,6 +195,7 @@ def new(cls, test_case, data={}):
             **data
         })
 
+
 class JournalParser:
     def __init__(self, journal_file):
         self.journal_file = journal_file

jogger

@@ -1,18 +1,18 @@
 #!/usr/bin/env python3
 #
 # Copyright(c) 2023 Intel Corporation
+# Copyright(c) 2024 Huawei Technologies
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-from common import ConfigFile, JournalFile, StatusFile, TestCase, TestEvent, JournalParser
+from common import JournalFile, StatusFile, TestCase, TestEvent, JournalParser
 
 from datetime import datetime
 from functools import reduce
 from tabulate import tabulate
 from tempfile import NamedTemporaryFile
 import argparse
 import daemon
-import hashlib
 import json
 import os
 import shutil
@@ -27,27 +27,27 @@ def error(*args, **kwargs):
 class Printer:
     @staticmethod
     def red(string):
-        return "\033[0;31m"+string+"\033[0m"
+        return "\033[0;31m" + string + "\033[0m"
 
     @staticmethod
     def green(string):
-        return "\033[0;32m"+string+"\033[0m"
+        return "\033[0;32m" + string + "\033[0m"
 
     @staticmethod
     def yellow(string):
-        return "\033[0;33m"+string+"\033[0m"
+        return "\033[0;33m" + string + "\033[0m"
 
     @staticmethod
     def blue(string):
-        return "\033[0;34m"+string+"\033[0m"
+        return "\033[0;34m" + string + "\033[0m"
 
 
 class DataPrinter:
     def __init__(self, output_format='table'):
         if output_format not in ['table', 'json']:
             raise ValueError(f"Invalid output format '{output_format}'")
         self.output_format = output_format
-        self.caption = None
+        self.captions = None
         self.data = None
 
     def setCaptions(self, captions):
@@ -188,7 +188,7 @@ class ScopeHandler:
         )
 
     def run(self, req):
-        tests = reduce(lambda acc, sha: acc+self.__tests_by_sha(sha), req, [])
+        tests = reduce(lambda acc, sha: acc + self.__tests_by_sha(sha), req, [])
         test_events = []
         with self.journal_file.record() as journal:
             for test_case in tests:
@@ -238,7 +238,6 @@ class ScopeHandler:
         for res in results:
             results_dict[res['sha']] = res
 
-        scope_status = []
         for test_case in tests:
             queued_events = filter(
                 lambda e: e['test-case'] == test_case,
@@ -303,7 +302,6 @@ class ScopeHandler:
         )
 
 
-
 class TestSelector:
     def __init__(self, tests):
         self.tests = tests
@@ -325,6 +323,7 @@ class TestSelector:
             tmpf.seek(0)
             return [line.split()[0] for line in tmpf.readlines()]
 
+
 usage = """%(prog)s command [args]
 
 Supported commands:
@@ -355,13 +354,15 @@ class SuperRunnerCli:
         self.scope_handler = ScopeHandler()
         getattr(self, command)(f"{parser.prog} {args.command}", argv[1:])
 
-    def __color_result(self, string):
+    @staticmethod
+    def __color_result(string):
         return {
             'PASSED': Printer.green,
             'FAILED': Printer.red,
         }.get(string, Printer.yellow)(string)
 
-    def __print_test_events(self, args, test_events):
+    @staticmethod
+    def __print_test_events(args, test_events):
         p = ListPrinter(args.format)
         id_field = ('id', 'sha')[args.long]
         test_field = ('function', 'test')[args.long]
@@ -383,16 +384,17 @@ class SuperRunnerCli:
             })
         p.print()
 
-    def init(self, prog, argv):
+    @staticmethod
+    def init(prog, argv):
         parser = argparse.ArgumentParser(
             prog=prog,
             description="Initialize new test scope"
         )
-        args = parser.parse_args(argv)
+        _ = parser.parse_args(argv)
 
         runner_path = os.getenv('RUNNER_PATH')
         if not runner_path:
-            error("Enrvironment variable 'RUNNER_PATH' is not set!")
+            error("Environment variable 'RUNNER_PATH' is not set!")
             exit(1)
         if os.path.isdir("meta"):
             error("Existing runner scope found in this directory!")
@@ -426,7 +428,7 @@ class SuperRunnerCli:
                 'sha': test_case['sha'],
                 'function': test_case.function(),
                 'test': test_case.test()
-        })
+            })
         p.print()
 
     def run(self, prog, argv):
@@ -487,7 +489,7 @@ class SuperRunnerCli:
         args = parser.parse_args(argv)
 
         test_event = self.scope_handler.test_event_by_sha({'sha': args.id})
-        deleted_event = self.scope_handler.delete({'test-event': test_event})
+        self.scope_handler.delete({'test-event': test_event})
 
     def queue(self, prog, argv):
         parser = argparse.ArgumentParser(
@@ -556,8 +558,8 @@ class SuperRunnerCli:
                 last_event_result = self.__color_result(last_event['result'])
                 last_event_id = last_event['sha'][:16]
                 last_event_sha = last_event['sha']
-                last_event_date = datetime.fromtimestamp(last_event['end-timestamp']) \
-                                          .strftime("%Y-%m-%d %H:%M:%S")
+                last_event_date = (datetime.fromtimestamp(last_event['end-timestamp'])
+                                   .strftime("%Y-%m-%d %H:%M:%S"))
             except:
                 last_event_result = last_event_id = last_event_sha = last_event_date = ""
             p.addEntry({
@@ -571,7 +573,7 @@ class SuperRunnerCli:
                 'last-result-id': last_event_id,
                 'last-result-sha': last_event_sha,
                 'last-result-date': last_event_date
-        })
+            })
         p.print()
 
     def results(self, prog, argv):
@@ -620,7 +622,7 @@ class SuperRunnerCli:
                 'test': test_case.test(),
                 'result': self.__color_result(test_event['result']),
                 'duration': test_event.duration()
-        })
+            })
         p.print()
 
     def show(self, prog, argv):
@@ -701,7 +703,8 @@ class SuperRunnerCli:
             with daemon.DaemonContext():
                 webbrowser.open_new_tab(os.path.join(test_case['logs'], "main.html"))
 
-    def stdout(self, prog, argv):
+    @staticmethod
+    def stdout(prog, argv):
         parser = argparse.ArgumentParser(
             prog=prog,
             description="Show pytest standard output on selected DUT"

requirements.txt

@@ -3,3 +3,4 @@ python-daemon>=2.2.4
 setproctitle>=1.1.10
 tabulate>=0.8.7
 watchdog>=0.10.3
+pyyaml>=5.4

runnerd

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 #
 # Copyright(c) 2023 Intel Corporation
+# Copyright(c) 2024 Huawei Technologies
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -25,7 +26,6 @@ import os
 import sys
 import time
 
-
 logging.basicConfig(
     filename="runnerd.log",
     level=logging.ERROR,
@@ -39,6 +39,7 @@ scriptdir = os.path.dirname(__file__)
 class EventHandler(FileSystemEventHandler):
     def __init__(self, callback):
         self.callback = callback
+
     def on_modified(self, event):
         self.callback()
 
@@ -95,7 +96,7 @@ class Dut:
         def run_in_thread(self, test_event, on_complete):
             self.config['meta'] = {
                 **test_event,
-                'test-case' : {**test_event['test-case']}
+                'test-case': {**test_event['test-case']}
             }
             tmp_conf_file = NamedTemporaryFile(prefix="dut_config_", suffix=".yml")
             ConfigFile(tmp_conf_file.name).save(self.config)
@@ -104,9 +105,9 @@ class Dut:
             test_case = test_event['test-case']
             log.info(f"Start {test_case} @ {self.ip}")
             runner = PytestRunner(
-                test_dir = test_case['dir'],
-                log_dir = self.log_path,
-                stdout_path = self.stdout_path
+                test_dir=test_case['dir'],
+                log_dir=self.log_path,
+                stdout_path=self.stdout_path
             )
             runner.run(tmp_conf_file.name, test_case)
             log.info(f"Complete {test_case} @ {self.ip}")
@@ -188,7 +189,7 @@ class TestManager:
     def __load_progress(self):
         self.test_events_complete.clear()
         with self.progress_file.edit() as progress:
-            if not 'test-events' in progress:
+            if 'test-events' not in progress:
                 return
             progress['test-events'] = list(filter(
                 lambda entry: entry['status'] == "complete",
@@ -283,6 +284,7 @@ class MasterRunner:
             test_event['end-timestamp'] = time.time()
             self.test_manager.mark_complete(test_event)
             self.results_collector.collect()
+
         while True:
             self.duts_manager.collect_duts()
             log.debug("Looking for free DUT... ")
@@ -301,6 +303,7 @@ class ScopeParser:
     scope_config_path = "configs/scope_config.yml"
 
     def __init__(self):
+        self.observer = None
         self.scope_config_file = ConfigFile(self.scope_config_path)
         self.scope_file = StatusFile("meta/scope.json")
 
@@ -346,6 +349,7 @@ class ScopeParser:
     def stop(self):
         self.observer.join()
 
+
 def daemonize(enabled):
     if enabled:
         print("Starting daemon")
@@ -355,6 +359,7 @@ def daemonize(enabled):
         print("Starting in non-daemon mode")
         return contextlib.suppress()
 
+
 if __name__ == '__main__':
     setproctitle('runnerd')
     parser = argparse.ArgumentParser()