Correctly update environment from importing plan

The environment from the importing plan was ignored. As agreed, let's make the `environment` a cached property and inherit the importing plan environment automatically. Resolves teemtee#2446 Signed-off-by: Miroslav Vadkerti <[email protected]>
thrix · Nov 28, 2023 · a0bc749 · a0bc749
1 parent ecac615
commit a0bc749
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/tests/plan/import/basic.sh b/tests/plan/import/basic.sh
@@ -102,6 +102,11 @@ rlJournalStart
         rlAssertGrep "pass /lint/tests" $rlRun_LOG
     rlPhaseEnd
 
+    rlPhaseStartTest "Environment is inherited from the importing plan"
+        rlRun -s "tmt run -ddd discover plan --name /plans/environment"
+        rlAssertGrep "EXPECTED: some-string$" $rlRun_LOG
+    rlPhaseEnd
+
     rlPhaseStartCleanup
         rlRun "popd"
     rlPhaseEnd

diff --git a/tests/plan/import/data/plans.fmf b/tests/plan/import/data/plans.fmf
@@ -35,6 +35,15 @@
             url: https://github.com/teemtee/tmt
             name: /plans/provision
 
+/environment:
+    summary: Honor importing plan environment
+    plan:
+        import:
+            url: https://github.com/teemtee/tmt
+            name: /plans/sanity/lint
+    environment:
+        EXPECTED: some-string
+
 /dynamic-ref:
     summary: Git URL and dynamic ref
     context:

diff --git a/tmt/base.py b/tmt/base.py
@@ -1668,12 +1668,15 @@ def draw_test_serial_number(self, test: Test) -> int:
 
         return next(self._test_serial_number_generator)
 
-    @property
+    @tmt.utils.cached_property
     def environment(self) -> EnvironmentType:
         """ Return combined environment from plan data and command line """
         if self.my_run:
             combined = self._plan_environment.copy()
             combined.update(self._environment)
+            # Include environment of the importing plan
+            if self._original_plan is not None:
+                combined.update(self._original_plan.environment)
             # Command line variables take precedence
             combined.update(self.my_run.environment)
             # Include path to the plan data directory