baldertest 0.1.0b13__py3-none-any.whl → 0.1.0b14__py3-none-any.whl

_balder/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.0b13'
-__version_tuple__ = version_tuple = (0, 1, 0)
+__version__ = version = '0.1.0b14'
+__version_tuple__ = version_tuple = (0, 1, 0, 'b14')

_balder/collector.py

@@ -143,6 +143,26 @@ class Collector:
             raise AttributeError("please call the `collect()` method before omitting this value")
         return self._all_collected_setups
 
+    @property
+    def all_collected_scenarios_with_mro(self) -> List[Type[Scenario] | Type[object]]:
+        """returns a list of all collected scenarios that were found by the collector incl. all parent classes"""
+        if self._all_collected_scenarios is None:
+            raise AttributeError("please call the `collect()` method before omitting this value")
+        available_classes_with_mro = []
+        for cur_class in self._all_collected_scenarios:
+            available_classes_with_mro.extend([*inspect.getmro(cur_class)])
+        return list(set(available_classes_with_mro))
+
+    @property
+    def all_collected_setups_with_mro(self) -> List[Type[Setup] | Type[object]]:
+        """returns a list of all collected setups that were found by the collector incl. all parent classes"""
+        if self._all_collected_setups is None:
+            raise AttributeError("please call the `collect()` method before omitting this value")
+        available_classes_with_mro = []
+        for cur_class in self._all_collected_setups:
+            available_classes_with_mro.extend([*inspect.getmro(cur_class)])
+        return list(set(available_classes_with_mro))
+
     @property
     def all_scenarios(self) -> List[Type[Scenario]]:
         """returns a list of all scenarios that were found by the collector"""
@@ -174,17 +194,18 @@ class Collector:
             raise AttributeError("please call the `collect()` method before omitting this value")
         return self._all_connections
 
-    def get_class_and_method_type_for(self, func) -> Tuple[Union[type, None], MethodLiteralType]:
+    def get_class_and_method_type_for(self, func) -> Tuple[Union[type, None], MethodLiteralType] | None:
         """
         This helper function returns the related class and the type of the method (`staticmethod`, `classmethod`,
         `instancemethod` or `function`) as tuple.
-        """
+        The method returns None if the provided element isn't a method of a valid :class:`Scenario` / :class:`Setup`
+        class.
 
-        available_classes = self.all_collected_scenarios + self.all_collected_setups
-        available_classes_with_mro = []
-        for cur_class in available_classes:
-            available_classes_with_mro.extend([*inspect.getmro(cur_class)])
-        available_classes_with_mro = set(available_classes_with_mro)
+        :param func: the function/method the class/function type should be returned for
+        :return: tuple with the class (or None for functions) and the method type or None if this function/method is not
+                 part of any known and active scenario/setup or their parent classes
+        """
+        available_classes_with_mro = self.all_collected_scenarios_with_mro + self.all_collected_setups_with_mro
 
         qualname = func.__qualname__
 
@@ -195,7 +216,7 @@ class Collector:
         for cur_class in available_classes_with_mro:
             if cur_class.__qualname__ == expected_class_name:
                 return cur_class, get_method_type(cur_class, func)
-        raise ValueError(f'function {func.__qualname__} is not part of any scenario or setup')
+        return None
 
     def get_fixture_manager(self) -> FixtureManager:
         """
@@ -203,15 +224,17 @@ class Collector:
         :return: the fixture manager that is valid for this session
         """
         resolved_dict = {}
-        for cur_level_as_str, cur_module_fixture_dict in self._raw_fixtures.items():
+        for cur_level_as_str, all_fixture_callable_of_that_level in self._raw_fixtures.items():
             cur_level = FixtureExecutionLevel(cur_level_as_str)
             resolved_dict[cur_level] = {}
-            for cur_fn in cur_module_fixture_dict:
-                cls, func_type = self.get_class_and_method_type_for(cur_fn)
-                # mechanism also works for balderglob fixtures (`func_type` is 'function' and `cls` is None)
-                if cls not in resolved_dict[cur_level].keys():
-                    resolved_dict[cur_level][cls] = []
-                resolved_dict[cur_level][cls].append((func_type, cur_fn))
+            for cur_callable in all_fixture_callable_of_that_level:
+                callable_meth_type_tuple = self.get_class_and_method_type_for(cur_callable)
+                if callable_meth_type_tuple:
+                    cls, func_type = callable_meth_type_tuple
+                    # mechanism also works for balderglob fixtures (`func_type` is 'function' and `cls` is None)
+                    if cls not in resolved_dict[cur_level].keys():
+                        resolved_dict[cur_level][cls] = []
+                    resolved_dict[cur_level][cls].append((func_type, cur_callable))
         return FixtureManager(resolved_dict)
 
     def load_balderglob_py_file(self) -> Union[types.ModuleType, None]:

_balder/utils/functions.py

@@ -77,7 +77,7 @@ def get_method_type(func_class, func) -> MethodLiteralType:
     expected_class_qualname = func.__qualname__.rpartition('.')[0]
 
     def get_for(the_class):
-        if the_class.__qualname__ == expected_class_qualname:
+        if func.__name__ in the_class.__dict__.keys() and the_class.__qualname__ == expected_class_qualname:
             fn_type = the_class.__dict__.get(func.__name__)
 
             if isinstance(fn_type, classmethod):

{baldertest-0.1.0b13.dist-info → baldertest-0.1.0b14.dist-info}/METADATA

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

{baldertest-0.1.0b13.dist-info → baldertest-0.1.0b14.dist-info}/RECORD

@@ -1,9 +1,9 @@
 _balder/__init__.py,sha256=Qk4wkVInPlXLFV36Yco5K7PDawJoeeWQVakzj6g5pmA,195
-_balder/_version.py,sha256=RidGLONbtMyaeTxRFsnFoG0JART6r-D1DZSuTpS3ikw,514
+_balder/_version.py,sha256=g5k4tbPdhrhEa3D2X-tMb0NvEt7IbfLQzEQ3Vp3Tq9w,521
 _balder/balder_plugin.py,sha256=EQzJP1dwwVDydhMLJtAmTCXOczlDuXBJur05lalmK_k,3136
 _balder/balder_session.py,sha256=ezT86gC_VzPQZOQ4r5qQ75IEm6rXZHiIpEqZDczkRsE,16149
 _balder/balder_settings.py,sha256=U96PVep7dGSaTXrMfeZMYf6oCIcEDPEqrBlFcoX476s,582
-_balder/collector.py,sha256=rWpr7ZD64Dki-um7GaXlt9R_Jxl6E9OqTmMRSriDolg,44578
+_balder/collector.py,sha256=vjqU8suydg_s_YHEXt-KieR8gMzs9_KWDvgL62KJ0UI,46070
 _balder/connection.py,sha256=X0zGAsAywNFck-DBie38N-9sJLAde7UJ0qYuHaiO5GE,40775
 _balder/connection_metadata.py,sha256=FrTj6NNBBUl6QuFx8DWy6HRueufXB93WTBkdc41uFaE,13632
 _balder/decorator_connect.py,sha256=-DDHzTtEZVSHXAQNmqnu3x2gfOJu08Lq4piBDQ1R0no,5857
@@ -72,7 +72,7 @@ _balder/objects/connections/osi_7_application.py,sha256=VPTlKKCEd9FFusce2wVbScIB
 _balder/objects/devices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 _balder/objects/devices/this_device.py,sha256=Ah0UNIqgUbtZ_B85fROjKbQS-NTDH1F3gscshB8UBsc,442
 _balder/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-_balder/utils/functions.py,sha256=6qpHSSlUz-Xc0t00VPIKJzzJBJrjYi9ii4mTFX-fb_I,4276
+_balder/utils/functions.py,sha256=0GcyDhEh1OCtY6RxOMBvvalTcTC97pgL9Ggg1iMYiiI,4323
 _balder/utils/inner_device_managing_metaclass.py,sha256=5haJb6XNjhxULFW1Sy8Dp7SO9Hex-yuF0rK1FG0UOXk,570
 _balder/utils/mixin_can_be_covered_by_executor.py,sha256=yDOsYh9mfhcLUAH0ahuFbdDKYsxaqbPsUEEctC3YenU,718
 _balder/utils/typings.py,sha256=eh3mw8wRQjTkuitGJKJSKu2JmyOnpWYMI9bAzE9M_KU,118
@@ -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.0b13.dist-info/licenses/LICENSE,sha256=Daz9qTpqbiq-klWb2Q9lYOmn3rJ5oIQnbs62sGcqOZ4,1084
-baldertest-0.1.0b13.dist-info/METADATA,sha256=H1qa7Y2O_dxTi1st-H9NpKKmU0bOIgDhJiouXU_dE9g,15806
-baldertest-0.1.0b13.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-baldertest-0.1.0b13.dist-info/entry_points.txt,sha256=hzqu_nrMKTCi5IJqzS1fhIXWEiL7mTGZ-kgj2lUYlRU,65
-baldertest-0.1.0b13.dist-info/top_level.txt,sha256=RUkIBkNLqHMemx2C9aEpoS65dpqb6_jU-oagIPxGQEA,15
-baldertest-0.1.0b13.dist-info/RECORD,,
+baldertest-0.1.0b14.dist-info/licenses/LICENSE,sha256=Daz9qTpqbiq-klWb2Q9lYOmn3rJ5oIQnbs62sGcqOZ4,1084
+baldertest-0.1.0b14.dist-info/METADATA,sha256=4jKylhMf05-alO4ThYvff56kssjzuh6dWMcobpMAUpE,15806
+baldertest-0.1.0b14.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+baldertest-0.1.0b14.dist-info/entry_points.txt,sha256=hzqu_nrMKTCi5IJqzS1fhIXWEiL7mTGZ-kgj2lUYlRU,65
+baldertest-0.1.0b14.dist-info/top_level.txt,sha256=RUkIBkNLqHMemx2C9aEpoS65dpqb6_jU-oagIPxGQEA,15
+baldertest-0.1.0b14.dist-info/RECORD,,

{baldertest-0.1.0b13.dist-info → baldertest-0.1.0b14.dist-info}/WHEEL

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