squash: add test, fix preserved files

teemtee · Aug 15, 2024 · 4a17a03 · 4a17a03
1 parent 4427964
commit 4a17a03
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/tests/finish/basic/test.sh b/tests/finish/basic/test.sh
@@ -19,6 +19,14 @@ rlJournalStart
         rlAssertNotExists "$tmp/cleanup-test"
     rlPhaseEnd
 
+    rlPhaseStartTest "Verify prepare and finish step save results"
+        rlRun "tmt run -i $tmp --scratch provision prepare finish"
+        rlAssertExists "$tmp/prepare/results.yaml"
+        rlAssertEquals "Prepare results exists and it's empty" "$(cat $tmp/prepare/results.yaml)" "[]"
+        rlAssertExists "$tmp/finish/results.yaml"
+        rlAssertEquals "Finish results exists and it's empty" "$(cat $tmp/finish/results.yaml)" "[]"
+    rlPhaseEnd
+
     rlPhaseStartCleanup
         rlRun "popd"
         rlRun "rm -r $tmp" 0 "Removing tmp directory"

diff --git a/tmt/steps/finish/__init__.py b/tmt/steps/finish/__init__.py
@@ -93,6 +93,10 @@ class Finish(tmt.steps.Step):
 
     _plugin_base_class = FinishPlugin
 
+    _preserved_workdir_members = [
+        *tmt.steps.Step._preserved_workdir_members,
+        'results.yaml']
+
     def wake(self) -> None:
         """ Wake up the step (process workdir and command line) """
         super().wake()

diff --git a/tmt/steps/prepare/__init__.py b/tmt/steps/prepare/__init__.py
@@ -112,6 +112,10 @@ class Prepare(tmt.steps.Step):
 
     _plugin_base_class = PreparePlugin
 
+    _preserved_workdir_members = [
+        *tmt.steps.Step._preserved_workdir_members,
+        'results.yaml']
+
     def __init__(
             self,
             *,