Pylint fixes after update

This is a set of fixed caught by pylint after update to version 4.0.0

Signed-off-by: Jan Richter <[email protected]>

Author: richtja

avocado/core/data_dir.py

@@ -373,6 +373,7 @@ def get_job_results_dir(job_ref, logs_dir=None):
     if len(short_jobid) < 7:
         short_jobid += "*"
     idfile_pattern = os.path.join(logs_dir, f"job-*-{short_jobid}", "id")
+    match_file = None
     for id_file in glob.glob(idfile_pattern):
         with open(id_file, "r", encoding="utf-8") as fid:
             line = fid.read().strip("\n")

avocado/core/nrunner/runner.py

@@ -73,6 +73,7 @@ def running_loop(self, condition):
                           condition for continuing the loop
         """
         most_current_execution_state_time = None
+        next_execution_state_mark = 0
         while not condition():
             now = time.monotonic()
             if most_current_execution_state_time is not None:

avocado/core/varianter.py

@@ -349,8 +349,7 @@ def itertests(self):
                 for plugin_variants in plugins_variants
                 for variant in plugin_variants
             )
-            for variant in iter(iter_variants):
-                yield variant
+            yield from iter(iter_variants)
         else:  # No real variants, but currently *something* needs to be returned
             yield {
                 "variant": self.node_class("").get_leaves(),

avocado/plugins/config.py

@@ -88,8 +88,7 @@ def handle_default():
             blength = 0
             for namespace, value in config.items():
                 clength = len(namespace)
-                if clength > blength:
-                    blength = clength
+                blength = max(blength, clength)
 
             format_str = "    %-" + str(blength) + "s %s"
 

avocado/plugins/json_variants.py

@@ -99,8 +99,7 @@ def __iter__(self):
                 "Iterating Varianter before initialization is not supported"
             )
 
-        for variant in self.variants.itertests():
-            yield variant
+        yield from self.variants.itertests()
 
     def __len__(self):
         if self.variants == _NO_VARIANTS:

avocado/plugins/jsonresult.py

@@ -46,6 +46,8 @@ def _render(result):
             test_id = test.get("name", UNKNOWN)
             if isinstance(test_id, TestID):
                 name = f"{test_id.name}{test_id.str_variant}"
+            else:
+                name = str(test_id)
             tests.append(
                 {
                     "id": str(test_id),

avocado/plugins/runners/avocado_instrumented.py

@@ -163,13 +163,11 @@ def run(self, runnable):
 
             process.start()
 
-            for message in self._monitor(queue):
-                yield message
+            yield from self._monitor(queue)
 
         except TestInterrupt:
             process.terminate()
-            for message in self._monitor(queue):
-                yield message
+            yield from self._monitor(queue)
         except Exception as e:
             yield messages.StderrMessage.get(traceback.format_exc())
             yield messages.FinishedMessage.get(

avocado/plugins/runners/package.py

@@ -98,12 +98,14 @@ def _run_software_manager(self, cmd, package, queue):
 
         if cmd == "install":
             result, stdout, stderr = self._install(software_manager, cmd, package)
-
         elif cmd == "remove":
             result, stdout, stderr = self._remove(software_manager, cmd, package)
-
         elif cmd == "check":
             result, stdout, stderr = self._check(software_manager, package)
+        else:
+            result = "error"
+            stdout = ""
+            stderr = f"Invalid command: {cmd}"
 
         output = {"result": result, "stdout": stdout, "stderr": stderr}
         queue.put(output)

avocado/plugins/runners/pip.py

@@ -45,6 +45,7 @@ def run(self, runnable):
 
             package = runnable.kwargs.get("name")
             # if package was passed correctly, run python -m pip
+            result = None
             if package is not None:
                 try:
                     cmd = f"python3 -m ensurepip && python3 -m pip {cmd} {package}"
@@ -54,9 +55,13 @@ def run(self, runnable):
                     yield messages.FinishedMessage.get("error")
                     return
 
-            yield messages.StdoutMessage.get(result.stdout)
-            yield messages.StderrMessage.get(result.stderr)
-            yield messages.FinishedMessage.get("pass")
+            if result is not None:
+                yield messages.StdoutMessage.get(result.stdout)
+                yield messages.StderrMessage.get(result.stderr)
+                yield messages.FinishedMessage.get("pass")
+            else:
+                yield messages.StderrMessage.get("Package name is required")
+                yield messages.FinishedMessage.get("error")
         except Exception as e:
             yield messages.StderrMessage.get(traceback.format_exc())
             yield messages.FinishedMessage.get(

avocado/plugins/runners/python_unittest.py

@@ -167,6 +167,7 @@ def run(self, runnable):
             process.start()
 
             most_current_execution_state_time = None
+            next_execution_state_mark = None
             while True:
                 if queue.empty():
                     time.sleep(RUNNER_RUN_CHECK_INTERVAL)