Merge branch 'main' into pr/45

Author: JFoederer

pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "robotframework-mbt"
-version = "0.10.0"
+version = "0.11.0"
 description = "Model-Based Testing in Robot framework with test case generation"
 readme = "README.md"
 authors = [{ name = "Johan Foederer", email = "github@famfoe.nl" }]

robotmbt/modeller.py

@@ -34,6 +34,7 @@
 
 from robot.api import logger
 from robot.utils import is_list_like
+from robot.errors import TimeoutExceeded  # Raised by Robot in case of keyword timeout
 
 from .modelspace import ModelSpace
 from .steparguments import StepArguments, ArgKind
@@ -80,6 +81,8 @@ def process_scenario(scenario: Scenario, model: ModelSpace) -> tuple[Scenario |
                     else:
                         return None, None, dict(fail_msg=f"Unable to insert scenario {scenario.src_id}, "
                                                 f"{scenario.name}, due to step '{step}': [{expr}] is False")
+            except TimeoutExceeded:
+                raise
             except Exception as err:
                 return None, None, dict(fail_msg=f"Unable to insert scenario {scenario.src_id}, "
                                         f"{scenario.name}, due to step '{step}': [{expr}] {err}")
@@ -129,6 +132,8 @@ def handle_refinement_exit(inserted_refinement: Scenario, tracestate: TraceState
         try:
             if tracestate.model.process_expression(expr, refinement_tail.steps[1].args) is False:
                 break
+        except TimeoutExceeded:
+            raise
         except Exception:
             break
     else:
@@ -211,6 +216,8 @@ def generate_scenario_variant(scenario: Scenario, model: ModelSpace) -> Scenario
                         step.args[modded_arg].value = modded_free_args
                 else:
                     raise AssertionError(f"Unknown argument kind for {modded_arg}")
+    except TimeoutExceeded:
+        raise
     except Exception as err:
         logger.debug(f"Unable to insert scenario {scenario.src_id}, {scenario.name}, due to modifier\n"
                      f"    In step {step}: {err}")

robotmbt/steparguments.py

@@ -116,7 +116,7 @@ def make_codestring(text: Any) -> str:
             return codestr.title()
         try:
             float(codestr)
-        except:
+        except (TypeError, ValueError, OverflowError, ZeroDivisionError):
             codestr = StepArgument.make_identifier(codestr)
         return codestr
 

robotmbt/substitutionmap.py

@@ -118,7 +118,7 @@ def __init__(self, constraint: list[Any]):
             # Keep the items in optionset unique. Refrain from using Python sets
             # due to non-deterministic behaviour when using random seeding.
             self.optionset: list[Any] | None = list(dict.fromkeys(constraint))
-        except:
+        except TypeError:
             self.optionset: list[Any] | None = None
         if not self.optionset or isinstance(constraint, str):
             raise ValueError(f"Invalid option set for initial constraint: {constraint}")

robotmbt/suitedata.py

@@ -33,6 +33,7 @@
 import copy
 from typing import Literal, Any
 
+from robot.errors import TimeoutExceeded  # Raised by Robot in case of keyword timeout
 from robot.running.arguments.argumentspec import ArgumentSpec
 from robot.running.arguments.argumentvalidator import ArgumentValidator
 from robot.running.keywordimplementation import KeywordImplementation
@@ -230,6 +231,8 @@ def add_robot_dependent_data(self, robot_kw: KeywordImplementation):
             self.args += self.__handle_non_embedded_arguments(robot_kw.args)
             self.signature = robot_kw.name
             self.model_info = self.__parse_model_info(robot_kw._doc)
+        except TimeoutExceeded:
+            raise
         except Exception as ex:
             self.model_info['error'] = str(ex)
 

robotmbt/version.py

@@ -1 +1 @@
-VERSION: str = '0.10.0'
+VERSION: str = '0.11.0'