fix TestsWithAdjust conversion, address comments

Author: therazix

tmt/guest/__init__.py

@@ -50,6 +50,7 @@
     container,
     field,
     key_to_option,
+    option_to_key,
 )
 from tmt.package_managers import (
     FileSystemPath,
@@ -1325,6 +1326,7 @@ def from_spec(  # type: ignore[override]
         return super().from_spec(raw_data, logger)  # type: ignore[call-arg]
 
     def to_spec(self) -> tmt.steps._RawStepData:
+        """Convert to a form suitable for saving in a specification file"""
         spec = super().to_spec()
 
         spec.pop('facts', None)  # type: ignore[typeddict-item]
@@ -1336,20 +1338,27 @@ def to_spec(self) -> tmt.steps._RawStepData:
         return spec
 
     def to_minimal_spec(self) -> tmt.steps._RawStepData:
+        """
+        Convert to a form suitable for saving in a specification
+        file while skipping empty values.
+        """
         spec = {**super().to_minimal_spec()}
 
         spec.pop('facts', None)
         spec.pop('-OPTIONLESS-FIELDS', None)
 
+        # Some fields need special handling.
+        # Map them to functions that will correctly convert them.
         field_map: dict[str, Callable[[Any], Any]] = {
             'ansible': lambda ansible: ansible.to_spec() if self.ansible else {},
             'environment': lambda environment: environment.to_fmf_spec(),
             'hardware': lambda hardware: hardware.to_minimal_spec() if hardware else None,
         }
         for key, transform in field_map.items():
-            value = getattr(self, key, None)
+            value = getattr(self, option_to_key(key), None)
             if value is not None:
                 value = transform(value)
+            # Do not include empty values
             if value in (None, [], {}):
                 spec.pop(key, None)
             else:

tmt/recipe.py

@@ -10,6 +10,7 @@
     container,
     field,
     key_to_option,
+    option_to_key,
 )
 from tmt.log import Logger
 from tmt.result import ResultInterpret
@@ -234,7 +235,7 @@ def to_minimal_spec(self) -> _RawRecipeTest:
         }
 
         for key, transform in field_map.items():
-            value = getattr(self, key, None)
+            value = getattr(self, option_to_key(key), None)
             if value is not None:
                 value = transform(value)
             if value in (None, [], {}):
@@ -471,7 +472,7 @@ def to_minimal_spec(self) -> _RawRecipePlan:
         }
 
         for key, transform in field_map.items():
-            value = getattr(self, key, None)
+            value = getattr(self, option_to_key(key), None)
             if value is not None:
                 value = transform(value)
             if value in (None, [], {}):

tmt/steps/discover/shell.py

@@ -14,7 +14,13 @@
 import tmt.utils
 import tmt.utils.git
 from tmt._compat.typing import Self
-from tmt.container import SerializableContainer, SpecBasedContainer, container, field
+from tmt.container import (
+    SerializableContainer,
+    SpecBasedContainer,
+    container,
+    field,
+    option_to_key,
+)
 from tmt.steps import _RawStepData
 from tmt.steps.prepare.distgit import insert_to_prepare_step
 from tmt.utils import (
@@ -187,6 +193,8 @@ def to_spec(self) -> dict[str, Any]:
     def to_minimal_spec(self) -> dict[str, Any]:
         data = {key: value for key, value in self.items() if value not in (None, [], {})}
 
+        # Some fields need special handling.
+        # Map them to functions that will correctly convert them.
         field_map: dict[str, Callable[[Any], Any]] = {
             'link': lambda link: link.to_spec(),
             'require': lambda requires: [require.to_spec() for require in requires],
@@ -196,9 +204,10 @@ def to_minimal_spec(self) -> dict[str, Any]:
         }
 
         for key, transform in field_map.items():
-            value = getattr(self, key, None)
+            value = getattr(self, option_to_key(key), None)
             if value is not None:
                 value = transform(value)
+            # Do not include empty values
             if value in (None, [], {}):
                 data.pop(key, None)
             else:

tmt/steps/execute/upgrade.py

@@ -95,6 +95,20 @@ class ExecuteUpgradeData(ExecuteInternalData):
         normalize=tmt.utils.normalize_string_list,
     )
 
+    # ignore[override] & cast: two base classes define to_spec(), with conflicting
+    # formal types.
+    def to_spec(self) -> dict[str, Any]:  # type: ignore[override]
+        return {**super().to_spec(), 'test': [test.to_spec() for test in self.test]}
+
+    # ignore[override] & cast: two base classes define to_spec(), with conflicting
+    # formal types.
+    def to_minimal_spec(self) -> dict[str, Any]:  # type: ignore[override]
+        spec = super().to_minimal_spec()
+        spec.pop('test', None)
+        if self.test:
+            spec['test'] = [test.to_minimal_spec() for test in self.test]
+        return spec
+
 
 @tmt.steps.provides_method('upgrade')
 class ExecuteUpgrade(ExecuteInternal):

tmt/steps/provision/connect.py

@@ -5,7 +5,7 @@
 import tmt.steps
 import tmt.steps.provision
 import tmt.utils
-from tmt.container import container, field
+from tmt.container import container, field, option_to_key
 from tmt.guest import RebootMode
 from tmt.utils import Command, ShellScript
 from tmt.utils.wait import Waiting
@@ -74,15 +74,17 @@ def to_spec(self) -> tmt.steps._RawStepData:
                 'systemd-soft-reboot': str(self.systemd_soft_reboot)
                 if isinstance(self.systemd_soft_reboot, ShellScript)
                 else None,
-                'hard-reboot': str(self.systemd_soft_reboot)
-                if isinstance(self.systemd_soft_reboot, ShellScript)
+                'hard-reboot': str(self.hard_reboot)
+                if isinstance(self.hard_reboot, ShellScript)
                 else None,
             },
         )
 
     def to_minimal_spec(self) -> tmt.steps._RawStepData:
         spec = {**super().to_minimal_spec()}
 
+        # Some fields need special handling.
+        # Map them to functions that will correctly convert them.
         field_map: dict[str, Callable[[Any], Any]] = {
             'soft-reboot': lambda reboot: str(reboot) if isinstance(reboot, ShellScript) else None,
             'systemd-soft-reboot': lambda reboot: (
@@ -92,9 +94,10 @@ def to_minimal_spec(self) -> tmt.steps._RawStepData:
         }
 
         for key, transform in field_map.items():
-            value = getattr(self, key, None)
+            value = getattr(self, option_to_key(key), None)
             if value is not None:
                 value = transform(value)
+            # Do not include empty values
             if value in (None, [], {}):
                 spec.pop(key, None)
             else: