baldertest 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

_balder/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.1.1'
-__version_tuple__ = version_tuple = (0, 1, 1)
+__version__ = version = '0.1.2'
+__version_tuple__ = version_tuple = (0, 1, 2)
 
 __commit_id__ = commit_id = None

_balder/executor/executor_tree.py

@@ -62,9 +62,10 @@ class ExecutorTree(BasicExecutableExecutor):
             self.update_inner_feature_reference_in_all_setups()
 
     def _body_execution(self, show_discarded):
-        for cur_setup_executor in self.get_setup_executors():
+        for cur_setup_executor in self.get_setup_executors(return_discarded=show_discarded):
             prev_mark = cur_setup_executor.prev_mark
-            if cur_setup_executor.has_runnable_tests(show_discarded) or cur_setup_executor.has_skipped_tests():
+            if cur_setup_executor.has_runnable_tests(consider_discarded_too=show_discarded) \
+                    or cur_setup_executor.has_skipped_tests():
                 cur_setup_executor.execute(show_discarded=show_discarded)
             elif prev_mark == PreviousExecutorMark.SKIP:
                 cur_setup_executor.set_result_for_whole_branch(ResultState.SKIP)
@@ -78,17 +79,30 @@ class ExecutorTree(BasicExecutableExecutor):
 
     # ---------------------------------- METHODS -----------------------------------------------------------------------
 
-    def get_setup_executors(self) -> List[SetupExecutor]:
-        """returns all setup executors of this tree"""
-        return self._setup_executors
+    def get_setup_executors(self, return_discarded=False) -> List[SetupExecutor]:
+        """
+        returns all setup executors of this tree
 
-    def get_all_scenario_executors(self) -> List[ScenarioExecutor]:
+        :param return_discarded: True if the method should return discarded variations too
+
+        :return: a list of relevant :class:`SetupExecutor`
+        """
+        if return_discarded:
+            return self._setup_executors
+
+        return [
+            cur_setup_executor
+            for cur_setup_executor in self._setup_executors
+            if len(cur_setup_executor.get_scenario_executors(return_discarded=False)) > 0
+        ]
+
+    def get_all_scenario_executors(self, return_discarded=False) -> List[ScenarioExecutor]:
         """
         returns a list with all scenario executors
         """
         all_scenario_executor = []
-        for cur_setup_executor in self.get_setup_executors():
-            all_scenario_executor += cur_setup_executor.get_scenario_executors()
+        for cur_setup_executor in self.get_setup_executors(return_discarded=return_discarded):
+            all_scenario_executor += cur_setup_executor.get_scenario_executors(return_discarded=return_discarded)
         return all_scenario_executor
 
     def get_all_variation_executors(self, return_discarded=False) -> List[VariationExecutor]:
@@ -96,7 +110,7 @@ class ExecutorTree(BasicExecutableExecutor):
         returns a list with all variation executors
         """
         all_variation_executor = []
-        for cur_scenario_executor in self.get_all_scenario_executors():
+        for cur_scenario_executor in self.get_all_scenario_executors(return_discarded=return_discarded):
             all_variation_executor += cur_scenario_executor.get_variation_executors(return_discarded=return_discarded)
         return all_variation_executor
 
@@ -136,9 +150,9 @@ class ExecutorTree(BasicExecutableExecutor):
 
     def cleanup_empty_executor_branches(self, consider_discarded=False):
         to_remove_executor = []
-        for cur_setup_executor in self.get_setup_executors():
+        for cur_setup_executor in self.get_setup_executors(return_discarded=consider_discarded):
             cur_setup_executor.cleanup_empty_executor_branches(consider_discarded=consider_discarded)
-            if len(cur_setup_executor.get_scenario_executors()) == 0:
+            if len(cur_setup_executor.get_scenario_executors(return_discarded=consider_discarded)) == 0:
                 # remove this whole executor because it has no children anymore
                 to_remove_executor.append(cur_setup_executor)
         for cur_setup_executor in to_remove_executor:
@@ -169,7 +183,7 @@ class ExecutorTree(BasicExecutableExecutor):
         print_line(start_text)
         # check if there exists runnable elements
         runnables = [cur_exec.has_runnable_tests(consider_discarded_too=show_discarded)
-                     for cur_exec in self.get_setup_executors()]
+                     for cur_exec in self.get_setup_executors(return_discarded=show_discarded)]
         one_or_more_runnable_setups = None if len(runnables) == 0 else max(runnables)
         if one_or_more_runnable_setups:
             super().execute(show_discarded=show_discarded)
@@ -189,8 +203,8 @@ class ExecutorTree(BasicExecutableExecutor):
     def print_tree(self, show_discarded=False) -> None:
         """this method is an auxiliary method which outputs the entire tree"""
         print("RESOLVING OVERVIEW", end="\n\n")
-        for cur_setup_executor in self.get_setup_executors():
-            for cur_scenario_executor in cur_setup_executor.get_scenario_executors():
+        for cur_setup_executor in self.get_setup_executors(return_discarded=show_discarded):
+            for cur_scenario_executor in cur_setup_executor.get_scenario_executors(return_discarded=show_discarded):
                 for cur_variation_executor in cur_scenario_executor.get_variation_executors(
                         return_discarded=show_discarded):
                     applicable = cur_variation_executor.prev_mark != PreviousExecutorMark.DISCARDED

_balder/executor/scenario_executor.py

@@ -99,7 +99,8 @@ class ScenarioExecutor(BasicExecutableExecutor):
     def _body_execution(self, show_discarded):
         for cur_variation_executor in self.get_variation_executors(return_discarded=show_discarded):
             prev_mark = cur_variation_executor.prev_mark
-            if cur_variation_executor.has_runnable_tests() or cur_variation_executor.has_skipped_tests():
+            if cur_variation_executor.has_runnable_tests(consider_discarded_too=show_discarded) \
+                    or cur_variation_executor.has_skipped_tests():
                 cur_variation_executor.execute(show_discarded=show_discarded)
             elif prev_mark == PreviousExecutorMark.SKIP:
                 cur_variation_executor.set_result_for_whole_branch(ResultState.SKIP)

_balder/executor/setup_executor.py

@@ -79,9 +79,10 @@ class SetupExecutor(BasicExecutableExecutor):
         print(f"SETUP {self.base_setup_class.__class__.__name__}")
 
     def _body_execution(self, show_discarded):
-        for cur_scenario_executor in self.get_scenario_executors():
+        for cur_scenario_executor in self.get_scenario_executors(return_discarded=show_discarded):
             prev_mark = cur_scenario_executor.prev_mark
-            if cur_scenario_executor.has_runnable_tests(show_discarded) or cur_scenario_executor.has_skipped_tests():
+            if cur_scenario_executor.has_runnable_tests(consider_discarded_too=show_discarded) \
+                    or cur_scenario_executor.has_skipped_tests():
                 cur_scenario_executor.execute(show_discarded=show_discarded)
             elif prev_mark == PreviousExecutorMark.SKIP:
                 cur_scenario_executor.set_result_for_whole_branch(ResultState.SKIP)
@@ -123,13 +124,26 @@ class SetupExecutor(BasicExecutableExecutor):
                     # object
                     setattr(cur_feature, cur_ref_feature_name, replacing_candidate)
 
-    def get_scenario_executors(self) -> List[ScenarioExecutor]:
-        """returns a list with all scenario executors that belongs to this setup executor"""
-        return self._scenario_executors
+    def get_scenario_executors(self, return_discarded=False) -> List[ScenarioExecutor]:
+        """
+        returns a list with all scenario executors that belongs to this setup executor
+
+        :param return_discarded: True if the method should return discarded variations too
+
+        :return: a list of relevant :class:`ScenarioExecutor`
+        """
+        if return_discarded:
+            return self._scenario_executors
+
+        return [
+            cur_scenario_executor
+            for cur_scenario_executor in self._scenario_executors
+            if len(cur_scenario_executor.get_variation_executors(return_discarded=False)) > 0
+        ]
 
     def cleanup_empty_executor_branches(self, consider_discarded=False):
         to_remove_executor = []
-        for cur_scenario_executor in self.get_scenario_executors():
+        for cur_scenario_executor in self.get_scenario_executors(return_discarded=consider_discarded):
             cur_scenario_executor.cleanup_empty_executor_branches(consider_discarded=consider_discarded)
             if len(cur_scenario_executor.get_variation_executors(return_discarded=consider_discarded)) == 0:
                 # remove this whole executor because it has no children anymore

_balder/solver.py

@@ -219,9 +219,6 @@ class Solver:
                 variation_executor = VariationExecutor(device_mapping=cur_device_mapping, parent=scenario_executor)
                 variation_executor.verify_applicability()
 
-                if not variation_executor.can_be_applied():
-                    continue
-
                 scenario_executor.add_variation_executor(variation_executor)
 
                 for cur_testcase in scenario_executor.base_scenario_controller.get_all_test_methods():

{baldertest-0.1.1.dist-info → baldertest-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: baldertest
-Version: 0.1.1
+Version: 0.1.2
 Summary: balder: reusable scenario based test framework
 Home-page: https://docs.balder.dev
 Author: Max Stahlschmidt and others

{baldertest-0.1.1.dist-info → baldertest-0.1.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 _balder/__init__.py,sha256=Qk4wkVInPlXLFV36Yco5K7PDawJoeeWQVakzj6g5pmA,195
-_balder/_version.py,sha256=m8HxkqoKGw_wAJtc4ZokpJKNLXqp4zwnNhbnfDtro7w,704
+_balder/_version.py,sha256=Ok5oAXdWgR9aghaFXTafTeDW6sYO3uVe6d2Nket57R4,704
 _balder/balder_plugin.py,sha256=EQzJP1dwwVDydhMLJtAmTCXOczlDuXBJur05lalmK_k,3136
 _balder/balder_session.py,sha256=ezT86gC_VzPQZOQ4r5qQ75IEm6rXZHiIpEqZDczkRsE,16149
 _balder/balder_settings.py,sha256=U96PVep7dGSaTXrMfeZMYf6oCIcEDPEqrBlFcoX476s,582
@@ -31,7 +31,7 @@ _balder/previous_executor_mark.py,sha256=gwpGu7d-kwPzQT8CmaPfuEG6fess2Upf5Q-zX6O
 _balder/routing_path.py,sha256=icIp09sC51sBsNHZPrWzGOtLqrOT5Se_dj0Db7MwtwY,17093
 _balder/scenario.py,sha256=beHkEqb9pnhrMOt1qfgATSBWVfHahw9RsOCT-uxK6TE,954
 _balder/setup.py,sha256=sIyuqhDSCzxtkWXW48jRrLDvGWkZwgpL6NvEKrFM65E,890
-_balder/solver.py,sha256=NbpAdvrGWdJTY6eZmNZFr7YDubyggY0yW64rDB3JkT0,13121
+_balder/solver.py,sha256=eB7pf9224AJAbeF4HlMDHMMy06mmq3C-LiyX4NBlphw,13031
 _balder/testresult.py,sha256=AE_LWCwmR9aR36IHfPARaaqossBahv-P2URCZ8cFAvM,6893
 _balder/unmapped_vdevice.py,sha256=oKr01YVTLViWtZkYz8kx8ccTx-KmwgNrHuQqqD4eLQw,513
 _balder/vdevice.py,sha256=fc2xuMnTuN1RyfWh9mqFgLdSO9yGA75eERobTXUQ9JA,215
@@ -53,10 +53,10 @@ _balder/controllers/vdevice_controller.py,sha256=rWK3oHzXbNlgXf0xbWyssDevx0qQ7Bm
 _balder/executor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 _balder/executor/basic_executable_executor.py,sha256=RWwc8c4B7qO2BxlUB8dZH9IC64qm_KWh8tGCoBB8v6o,5395
 _balder/executor/basic_executor.py,sha256=6rLSBrTGodlaRVfHV2kpXPjbAqUPEq9-2txCxz_-fXg,9327
-_balder/executor/executor_tree.py,sha256=CfwUDUAgCb_k_haaqX7GC23DB2LLEpkL-NnSCEdufiA,10659
+_balder/executor/executor_tree.py,sha256=ZyZYRyeOjvZEW_BRds9Ujfa3TrNxa_ouAGRsLNoSVwk,11457
 _balder/executor/parametrized_testcase_executor.py,sha256=Wk4XitAVOMGU7pSn7AOyvOsuL9CorcqFJ-iRuVtat1M,2149
-_balder/executor/scenario_executor.py,sha256=tfQ1tKvmhAUgUkAcgJ94hI46hLcXAhIMD-d9qCmJiXg,8152
-_balder/executor/setup_executor.py,sha256=QWMWhfzsssRT_fHOUKjw4gHfC2CaZjhL5NxF1eNl35w,8604
+_balder/executor/scenario_executor.py,sha256=NMx4hJpY5Xtsd4ugrQTdX4bcczgi_aabtlqHIkMfXl8,8211
+_balder/executor/setup_executor.py,sha256=-nLTH0enq7IbWMlXPZF_sY5Mt78aDesMkFpco6qU8uM,9167
 _balder/executor/testcase_executor.py,sha256=Yrifk_8hsm1KKrE6udd84EyBywmWiUN00MlcezMQ7xA,8216
 _balder/executor/unresolved_parametrized_testcase_executor.py,sha256=Pb-LhEFNspb03pYTqTyFvSWPFMoRCjO8OVjjP2rHFMw,7628
 _balder/executor/variation_executor.py,sha256=wdWOIuXqkxsl-wifuEFWYaH_hLuvaYjvotdVPMM2g8I,53252
@@ -81,9 +81,9 @@ balder/connections.py,sha256=H6rf7UsiVY_FeZLngZXCT9WDw9cQqpiDiPbz_0J4yjM,2331
 balder/devices.py,sha256=zupHtz8yaiEjzR8CrvgZU-RzsDQcZFeN5mObfhtjwSw,173
 balder/exceptions.py,sha256=iaR4P2L7K3LggYSDnjCGLheZEaGgnMilxDQdoYD5KHQ,1954
 balder/parametrization.py,sha256=R8U67f6DEnXdDc9cGOgS8yFTEAfhglv1v9mnAUAExUg,150
-baldertest-0.1.1.dist-info/licenses/LICENSE,sha256=kNB2-kpqR9c3rEyXsMaQiqb1jiLZ5j6R6TSda63dcJY,1089
-baldertest-0.1.1.dist-info/METADATA,sha256=57HxDe28UklJXBXhRu5K4JX1cVmv_UnZ7tQ7M_BiX9I,14730
-baldertest-0.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-baldertest-0.1.1.dist-info/entry_points.txt,sha256=hzqu_nrMKTCi5IJqzS1fhIXWEiL7mTGZ-kgj2lUYlRU,65
-baldertest-0.1.1.dist-info/top_level.txt,sha256=RUkIBkNLqHMemx2C9aEpoS65dpqb6_jU-oagIPxGQEA,15
-baldertest-0.1.1.dist-info/RECORD,,
+baldertest-0.1.2.dist-info/licenses/LICENSE,sha256=kNB2-kpqR9c3rEyXsMaQiqb1jiLZ5j6R6TSda63dcJY,1089
+baldertest-0.1.2.dist-info/METADATA,sha256=OI7I2-tt0pTFpfxF95nOODxncv8y0XAXv61JWuJV0Eo,14730
+baldertest-0.1.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+baldertest-0.1.2.dist-info/entry_points.txt,sha256=hzqu_nrMKTCi5IJqzS1fhIXWEiL7mTGZ-kgj2lUYlRU,65
+baldertest-0.1.2.dist-info/top_level.txt,sha256=RUkIBkNLqHMemx2C9aEpoS65dpqb6_jU-oagIPxGQEA,15
+baldertest-0.1.2.dist-info/RECORD,,

{baldertest-0.1.1.dist-info → baldertest-0.1.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any