squash: fixing tests?

teemtee · Jan 5, 2024 · b6a3250 · b6a3250
1 parent 6982430
commit b6a3250
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/tmt/queue.py b/tmt/queue.py
@@ -1,7 +1,7 @@
 import dataclasses
 from collections.abc import Iterator
 from concurrent.futures import Future, ThreadPoolExecutor, as_completed
-from typing import TYPE_CHECKING, Generic, Optional, TypeVar
+from typing import TYPE_CHECKING, Any, Generic, Optional, TypeVar
 
 import tmt.utils
 from tmt.log import Logger
@@ -52,13 +52,13 @@ class Task(Generic[TaskResultT]):
     requested_exit: Optional[SystemExit]
 
     # Custom yet trivial `__init__` is necessary, see note in `tmt.queue.Task`.
-    def __init__(self, logger: Logger) -> None:
+    def __init__(self, logger: Logger, **kwargs: Any) -> None:
         self.logger = logger
 
-        self.result = None
-        self.guest = None
-        self.exc = None
-        self.requested_exit = None
+        self.result = kwargs.get('result', None)
+        self.guest = kwargs.get('guest', None)
+        self.exc = kwargs.get('exc', None)
+        self.requested_exit = kwargs.get('requested_exit', None)
 
     @property
     def name(self) -> str:
@@ -131,8 +131,8 @@ class GuestlessTask(Task[TaskResultT]):
     """
 
     # Custom yet trivial `__init__` is necessary, see note in `tmt.queue.Task`.
-    def __init__(self, logger: Logger) -> None:
-        super().__init__(logger)
+    def __init__(self, logger: Logger, **kwargs: Any) -> None:
+        super().__init__(logger, **kwargs)
 
     def run(self, logger: Logger) -> TaskResultT:
         """
@@ -188,8 +188,8 @@ class MultiGuestTask(Task[TaskResultT]):
     guests: list['Guest']
 
     # Custom yet trivial `__init__` is necessary, see note in `tmt.queue.Task`.
-    def __init__(self, logger: Logger, guests: list['Guest']) -> None:
-        super().__init__(logger)
+    def __init__(self, logger: Logger, guests: list['Guest'], **kwargs: Any) -> None:
+        super().__init__(logger, **kwargs)
 
         self.guests = guests
 

diff --git a/tmt/steps/__init__.py b/tmt/steps/__init__.py
@@ -1962,8 +1962,9 @@ class ActionTask(tmt.queue.GuestlessTask[None]):
     def __init__(
             self,
             logger: tmt.log.Logger,
-            phase: Action) -> None:
-        super().__init__(logger)
+            phase: Action,
+            **kwargs: Any) -> None:
+        super().__init__(logger, **kwargs)
 
         self.phase = phase
 
@@ -1986,8 +1987,9 @@ def __init__(
             self,
             logger: tmt.log.Logger,
             guests: list['Guest'],
-            phase: Plugin[StepDataT]) -> None:
-        super().__init__(logger, guests)
+            phase: Plugin[StepDataT],
+            **kwargs: Any) -> None:
+        super().__init__(logger, guests, **kwargs)
 
         self.phase = phase
 
@@ -2048,8 +2050,9 @@ class PushTask(tmt.queue.MultiGuestTask[None]):
     def __init__(
             self,
             logger: tmt.log.Logger,
-            guests: list['Guest']) -> None:
-        super().__init__(logger, guests)
+            guests: list['Guest'],
+            **kwargs: Any) -> None:
+        super().__init__(logger, guests, **kwargs)
 
     @property
     def name(self) -> str:
@@ -2070,8 +2073,9 @@ def __init__(
             self,
             logger: tmt.log.Logger,
             guests: list['Guest'],
-            source: Optional[Path] = None) -> None:
-        super().__init__(logger, guests)
+            source: Optional[Path] = None,
+            **kwargs: Any) -> None:
+        super().__init__(logger, guests, **kwargs)
 
         self.source = source