Update according to comments from Milos

Signed-off-by: Vector Li <[email protected]>
teemtee · Jun 6, 2023 · 3bba56c · 3bba56c
1 parent 631678a
commit 3bba56c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/tmt/base.py b/tmt/base.py
@@ -912,8 +912,7 @@ class Test(
     # `test` is mandatory, must exist, so how to initialize if it's missing :(
     test: Optional[ShellScript] = field(
         default=None,
-        normalize=lambda key_address, raw_value, logger:
-            None if raw_value is None else normalize_shell_script(key_address, raw_value, logger))
+        normalize=normalize_shell_script)
     path: Optional[Path] = field(
         default=None,
         normalize=lambda key_address, raw_value, logger:

diff --git a/tmt/utils.py b/tmt/utils.py
@@ -4424,7 +4424,7 @@ def normalize_shell_script_list(
 def normalize_shell_script(
         key_address: str,
         value: Union[None, str],
-        logger: tmt.log.Logger) -> ShellScript:
+        logger: tmt.log.Logger) -> Optional[ShellScript]:
     """
     Normalize a single string input value.
 
@@ -4442,7 +4442,7 @@ def normalize_shell_script(
     """
 
     if value is None:
-        return ShellScript('')
+        return None
 
     if isinstance(value, str):
         return ShellScript(value)