address review comment - populate self.resources in run

morganstanley · Nov 30, 2023 · 9a637bc · 9a637bc
1 parent 10f2ecc
commit 9a637bc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 21 deletions.
diff --git a/testplan/testing/base.py b/testplan/testing/base.py
@@ -190,7 +190,6 @@ def __init__(
 
         self._init_test_report()
         self._env_built = False
-        self._build_environment(delay=True)
 
     def __str__(self):
         return "{}[{}]".format(self.__class__.__name__, self.name)
@@ -395,7 +394,7 @@ def _init_context(self):
         else:
             self.resources._initial_context = self.cfg.initial_context
 
-    def _build_environment(self, delay: bool):
+    def _build_environment(self):
         """
         This method will execute at most twice, once with delay=True during __init__,
         and then with delay=False during _run. It will be no-op if called more
@@ -406,16 +405,10 @@ def _build_environment(self, delay: bool):
         if self._env_built:
             return
 
-        if delay:
-            if callable(self.cfg.environment):
-                return
-            else:
-                drivers = self.cfg.environment
+        if callable(self.cfg.environment):
+            drivers = self.cfg.environment()
         else:
-            if callable(self.cfg.environment):
-                drivers = self.cfg.environment()
-            else:
-                return
+            drivers = self.cfg.environment
 
         for driver in drivers:
             driver.parent = self
@@ -436,7 +429,8 @@ def add_pre_resource_steps(self):
         self._add_step(self._record_setup_start)
 
         self._add_step(self._init_context)
-        self._add_step(self._build_environment, delay=False)
+        # self._add_step(self._build_environment, delay=False)
+        self._add_step(self._build_environment)
         self._add_step(self._set_dependencies)
 
     def add_start_resource_steps(self):

diff --git a/tests/functional/testplan/runnable/interactive/test_interactive.py b/tests/functional/testplan/runnable/interactive/test_interactive.py
@@ -106,15 +106,6 @@ def test_top_level_tests():
         # TESTS AND ASSIGNED RUNNERS
         assert list(plan.interactive.all_tests()) == ["Test1", "Test2"]
 
-        # OPERATE TEST DRIVERS (start/stop)
-        resources = [
-            res.uid() for res in plan.interactive.test("Test2").resources
-        ]
-
-        assert resources == ["server", "client"]
-        for resource in plan.interactive.test("Test2").resources:
-            assert resource.status == resource.STATUS.NONE
-
         plan.interactive.start_test_resources("Test2")  # START
 
         for resource in plan.interactive.test("Test2").resources: