add unit test

Author: devership16

bzt/modules/_apiritif/generator.py

@@ -1970,6 +1970,32 @@ def _gen_actionid_exception_wrapped_body(self, body):
             )
         )
 
+        if len(body) == 1 and isinstance(body[0], ast.With):
+            with_stmt = body[0]
+            wrapped_try = ast.Try(
+                body=with_stmt.body,
+                handlers=[ast.ExceptHandler(
+                    type=ast.Name(id="Exception", ctx=ast.Load()),
+                    name="exc",
+                    body=[ast.Raise(
+                        exc=ast.Call(
+                            func=ast.Call(
+                                func=ast.Name(id="type", ctx=ast.Load()),
+                                args=[ast.Name(id="exc", ctx=ast.Load())],
+                                keywords=[]
+                            ),
+                            args=[final_error],
+                            keywords=[]
+                        ),
+                        cause=ast.Name(id="exc", ctx=ast.Load())
+                    )]
+                )],
+                orelse=[],
+                finalbody=[]
+            )
+            with_stmt.body = [wrapped_try]
+            return [with_stmt]
+
         wrapped_try = ast.Try(
             body=body,
             handlers=[ast.ExceptHandler(
@@ -1992,11 +2018,6 @@ def _gen_actionid_exception_wrapped_body(self, body):
             finalbody=[]
         )
 
-        if len(body) == 1 and isinstance(body[0], ast.With):
-            with_stmt = body[0]
-            with_stmt.body = [wrapped_try]
-            return [with_stmt]
-
         return [wrapped_try]
 
     def _gen_master_test_method(self, try_block, finally_block):

tests/unit/modules/_selenium/test_selenium_builder.py

@@ -204,6 +204,49 @@ def test_modern_actions_generator(self):
                           TestSeleniumScriptGeneration.clear_spaces(content),
                           msg="\n\n%s. %s" % (idx, target_lines[idx]))
 
+    def test_actionid_try_except_inside_step_method(self):
+        self.configure({
+            "execution": [{
+                "executor": "apiritif",
+                "scenario": "loc_sc"
+            }],
+            "scenarios": {
+                "loc_sc": {
+                    "default-address": "https://example.com",
+                    "requests": [{
+                        "label": "tx",
+                        "actions": [{
+                            "type": "go",
+                            "param": "https://example.com",
+                            "value": None,
+                            "actionId": "aid-1"
+                        }]
+                    }]
+                }
+            }
+        })
+
+        self.obj.prepare()
+        with open(self.obj.script) as fds:
+            content = fds.read()
+
+        self.assertIn(
+            TestSeleniumScriptGeneration.clear_spaces("with apiritif.smart_transaction('tx'):\n            try:"),
+            TestSeleniumScriptGeneration.clear_spaces(content)
+        )
+        self.assertIn(
+            TestSeleniumScriptGeneration.clear_spaces("raise type(exc)"),
+            TestSeleniumScriptGeneration.clear_spaces(content)
+        )
+        self.assertIn(
+            TestSeleniumScriptGeneration.clear_spaces(" actionId: "),
+            TestSeleniumScriptGeneration.clear_spaces(content)
+        )
+        self.assertIn(
+            TestSeleniumScriptGeneration.clear_spaces("def test_locsc(self):\n        self._1_tx()"),
+            TestSeleniumScriptGeneration.clear_spaces(content)
+        )
+
     @staticmethod
     def clear_spaces(content):
         return content.replace(" ", "").replace("\t", "").replace("\n", "")