cucu 1.3.7__py3-none-any.whl → 1.3.9__py3-none-any.whl

cucu/ansi_parser.py

@@ -25,12 +25,13 @@ TRANSLATION = (
         ESC_SEQ + "55": "",  # ignore HOME (num keypad)
         ESC_SEQ + "56": "",  # ignore UP ARROW (num keypad)
         ESC_SEQ + "57": "",  # ignore PAGE UP (num keypad)
+        ESC_SEQ + "1A": "",  # ignore move cursor up one line
     }
 )
 RE_TO_HTML = re.compile("|".join(map(re.escape, TRANSLATION)))
 
 RE_TO_REMOVE = re.compile(
-    r"\x1b\[(0;)?[0-9A-F]{1,2}m"
+    r"\x1b\[(0;)?[0-9A-F]{1,2}[mA]:?"
 )  # detect hex values, not just decimal digits
 
 

cucu/db.py

@@ -123,16 +123,16 @@ class step(BaseModel):
     duration = FloatField(null=True)
     start_at = DateTimeField(null=True)
     end_at = DateTimeField(null=True)
-    stdout = JSONField(null=True)
-    stderr = JSONField(null=True)
+    stdout = JSONField()
+    stderr = JSONField()
     error_message = JSONField(null=True)
     exception = JSONField(null=True)
-    debug_output = TextField(null=True)
-    browser_info = JSONField(null=True)
+    debug_output = TextField()
+    browser_info = JSONField()
     text = JSONField(null=True)
     table_data = JSONField(null=True)
     location = TextField()
-    browser_logs = TextField(null=True)
+    browser_logs = TextField()
     screenshots = JSONField(null=True)
 
 
@@ -213,6 +213,11 @@ def start_step_record(step_obj, scenario_run_id):
         is_substep=getattr(step_obj, "is_substep", False),
         has_substeps=getattr(step_obj, "has_substeps", False),
         section_level=getattr(step_obj, "section_level", None),
+        browser_info="",
+        browser_logs="",
+        debug_output="",
+        stderr=[],
+        stdout=[],
     )
 
 

cucu/formatter/junit.py

@@ -10,6 +10,7 @@ from behave.model_core import Status
 from bs4.formatter import XMLFormatter
 from tenacity import RetryError
 
+from cucu.ansi_parser import remove_ansi
 from cucu.config import CONFIG
 from cucu.utils import ellipsize_filename
 
@@ -286,7 +287,8 @@ class CucuJUnitFormatter(Formatter):
             if scenario["failure"] is not None:
                 failure_message = "\n".join(scenario["failure"])
                 failure = bs4.Tag(name="failure")
-                failure.append(bs4.CData(failure_message))
+                cleaned_failure_message = remove_ansi(failure_message)
+                failure.append(bs4.CData(cleaned_failure_message))
                 testcase.append(failure)
 
             if scenario["skipped"] is not None:

cucu/formatter/rundb.py

@@ -132,6 +132,8 @@ class RundbFormatter(Formatter):
     def scenario(self, scenario):
         """Called before a scenario is executed (or ScenarioOutline scenarios)."""
         self._finish_scenario()
+        # Set after CONFIG.restore() in environment.before_scenario()
+        CONFIG["FEATURE_RUN_ID"] = scenario.feature.feature_run_id
 
         self.this_scenario = scenario
         self.this_steps = []
@@ -139,7 +141,9 @@ class RundbFormatter(Formatter):
         scenario_run_id_seed = (
             f"{scenario.feature.feature_run_id}_{time.perf_counter()}"
         )
-        scenario.scenario_run_id = generate_short_id(scenario_run_id_seed)
+        CONFIG["SCENARIO_RUN_ID"] = scenario.scenario_run_id = (
+            generate_short_id(scenario_run_id_seed)
+        )
         scenario.custom_data = {}
 
         # feature.scenarios is a mix of Scenario and ScenarioOutline objects with their own scenarios list

cucu/reporter/html.py

@@ -139,14 +139,21 @@ def generate(results, basepath, only_failures=False):
                     if db_step.table_data:
                         step_dict["table"] = db_step.table_data
 
-                    step_dict["result"]["error_message"] = [
-                        db_step.error_message
-                    ]
-
+                    step_dict["result"]["error_message"] = (
+                        db_step.error_message.splitlines()
+                        if db_step.error_message
+                        else []
+                    )
                     step_dict["result"]["exception"] = db_step.exception
-
                     step_dict["result"]["stdout"] = db_step.stdout
                     step_dict["result"]["stderr"] = db_step.stderr
+                    step_dict["result"]["browser_logs"] = (
+                        db_step.browser_logs.splitlines()
+                    )
+                    step_dict["result"]["debug_output"] = (
+                        db_step.debug_output.splitlines()
+                    )
+
                     scenario_dict["steps"].append(step_dict)
 
                 feature_dict["elements"].append(scenario_dict)

cucu/reporter/templates/scenario.html

@@ -87,6 +87,9 @@
             {% endif %}
             {% if step['result'] is defined %}
                 {% set step_status = step['result']['status'] %}
+                {% if step['result']['status'] == 'skipped' %}
+                    {% set step_status = 'untested' %}
+                {% endif %}
                 {% if step['result']['status'] in ('failed', 'passed') and step["result"]["timestamp"] %}
                     {% set step_timing = "{} for {:.3f}s".format(step["result"]["timestamp"].strftime("%H:%M:%S"), step["result"]["duration"]) %}
                     {% set step_start = step["result"]["timestamp"] %}
@@ -131,24 +134,32 @@
                 <tr class="row"><td style="min-width: 0;" class="col-12 collapse multi-collapse" id="collapsable-row-{{ loop.index }}" colspan="2">
 
                 {% if step['result']['stdout'] %}
+                    <p>stdout ({{ step['result']['stdout']|length }} lines)</p>
                     <pre style="color: darkgray; margin: 0;">{{ escape("\n".join(step['result']['stdout'])) }}</pre>
                 {% endif %}
-
-                {% if step['images'] is defined %}
-                    {% if step['result']['stdout'] %}
-                        <br/>
-                    {% endif %}
+                {% if step['result']['stderr'] %}
+                    <p>stderr ({{ step['result']['stderr']|length }} lines)</p>
+                    <pre style="color: darkgray; margin: 0;">{{ escape("\n".join(step['result']['stderr'])) }}</pre>
+                {% endif %}
+                {% if step['images'] %}
+                    <p>images ({{ step['images']|length }} images)</p>
                     {% for image in step['images'] %}
                         <img class="mx-auto d-block img-fluid shadow bg-white rounded" style="margin-bottom:15px" alt='{{ image["label"] }}' title='{{ image["label"] }}' src='{{ image["src"] }}'></img>
                     {% endfor %}
                 {% endif %}
-
-                {% if step['result']['error_message'] is defined %}
-                    {% if step['image'] is defined %}
-                        <br/>
-                    {% endif %}
+                {% if step['result']['error_message'] %}
+                    <p>error message ({{ step['result']['error_message']|length }} lines)</p>
                     <pre style="color: gray; margin: 0">{{ escape("\n".join(step['result']['error_message'])) }}</pre>
                 {% endif %}
+                {% if step['result']['browser_logs'] %}
+                    <p>browser logs ({{ step['result']['browser_logs']|length }} lines)</p>
+                    <pre style="color: gray; margin: 0;">{{ escape("\n".join(step['result']['browser_logs'])) }}</pre>
+                {% endif %}
+                {% if step['result']['debug_output'] %}
+                    <p>debug output ({{ step['result']['debug_output']|length }} lines)</p>
+                    <pre style="color: gray; margin: 0;">{{ escape("\n".join(step['result']['debug_output'])) }}</pre>
+                {% endif %}
+
                 </td></tr>
             {% endif %}
 

{cucu-1.3.7.dist-info → cucu-1.3.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: cucu
-Version: 1.3.7
+Version: 1.3.9
 Summary: Easy BDD web testing
 Keywords: cucumber,selenium,behave
 Author: Domino Data Lab, Rodney Gomes, Cedric Young, Xin Dong, Kavya Yakkati, Kevin Garton, Joy Liao

{cucu-1.3.7.dist-info → cucu-1.3.9.dist-info}/RECORD

@@ -1,5 +1,5 @@
 cucu/__init__.py,sha256=YtuajsJBj3_DgNoygHen9gKojeQF523Oc27kyCUzoG0,1013
-cucu/ansi_parser.py,sha256=_yTlqr6KruLsqgWR6BkpJUC3bmlQy_9JbkuxFx6Jrbo,2213
+cucu/ansi_parser.py,sha256=gjAWBShqsm0GFdJWv8ptsN8he4HgaT18E7GNl3Po46o,2280
 cucu/behave_tweaks.py,sha256=MqIL9BDHMvmyXyzkVGbD3wd8IP38_8pgp3NPGDWudm8,6873
 cucu/browser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cucu/browser/core.py,sha256=Ixcqr8l4xshzdW4AKcl1IkH98xHwRYsbt4snV7wUDlo,2692
@@ -12,7 +12,7 @@ cucu/cli/run.py,sha256=XIGIACPieywM5Mi3k_CycM9eiRElzGNZdHlV0_TDSVY,6118
 cucu/cli/steps.py,sha256=lg5itVH_C-0_3RelWXv9X2qQUHggdxuxLCGwH5l1bf4,4210
 cucu/cli/thread_dumper.py,sha256=Z3XnYSxidx6pqjlQ7zu-TKMIYZWk4z9c5YLdPkcemiU,1593
 cucu/config.py,sha256=5AE6GrkqzjNhzzrB-eZrINgeztV7CCGuSdWJ-5GtWhk,14939
-cucu/db.py,sha256=iJ5NXECcqVbPdqozuQrdRGpCX1EgEENwDEGEsLUxpRs,14513
+cucu/db.py,sha256=0aT4h1hGeToIBXlPoxkuB7dBpQ3lMlUHWfq-J3WJINA,14581
 cucu/edgedriver_autoinstaller/README.md,sha256=tDkAWIqgRdCjt-oX1nYqikIC_FfiOEM2-pc5S5VbRLo,84
 cucu/edgedriver_autoinstaller/__init__.py,sha256=fo6xJJPvcc5Xvni8epXfxDoPxJH5_b6Vk2jD9JTwfRs,969
 cucu/edgedriver_autoinstaller/utils.py,sha256=iRKTww77CGaTAntt_QDvxlKPxpMU4otx95OeD97khcM,6802
@@ -21,8 +21,8 @@ cucu/external/jquery/jquery-3.5.1.min.js,sha256=9_aliU8dGd2tb6OSsuzixeV4y_faTqgF
 cucu/formatter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cucu/formatter/cucu.py,sha256=NRLFsd6xl3uwUk45ihKN2OEioOeAqeTURrcQgscDGnU,9351
 cucu/formatter/json.py,sha256=fJ1dZBGwYD4OkhQFDE49MRKGNzsrhDzQYq-dUfsYh94,10589
-cucu/formatter/junit.py,sha256=aJ9dGLbamMH-wUi_msF66_-_c_YUq07-8_wCNEjUju4,10129
-cucu/formatter/rundb.py,sha256=7gKVPbSg7bCuAt972XRs5vRjeowLzVZPaOHCIxUazrE,7668
+cucu/formatter/junit.py,sha256=dCyS47iHOqn5AZjsRpWCsDRkxxJ67IZy3wIlE5jjhoM,10249
+cucu/formatter/rundb.py,sha256=dKNlD-LXmrJ1Gm4OHI7Cs49eMuBGlBfwLz7NLISF5sg,7857
 cucu/fuzzy/__init__.py,sha256=ce4JRmaBF6oab6U99Qbpt7DrD3elhH32__-ND6fw5xc,104
 cucu/fuzzy/core.py,sha256=tmQKX_Ni-2ohoxzctRUg2x7zMeEW8MlJJmpU3PfTmvQ,3153
 cucu/fuzzy/fuzzy.js,sha256=ee-TytISLyUo7cMAkuVI5qbLXdt0eoFWczTsoU4zYhg,11618
@@ -56,12 +56,12 @@ cucu/reporter/external/jquery-3.5.1.min.js,sha256=9_aliU8dGd2tb6OSsuzixeV4y_faTq
 cucu/reporter/external/jquery.dataTables.min.js,sha256=XNhaB1tBOSFMHu96BSAJpZOJzfZ4SZI1nwAbnwry2UY,90265
 cucu/reporter/external/popper.min.js,sha256=pS96pU17yq-gVu4KBQJi38VpSuKN7otMrDQprzf_DWY,19188
 cucu/reporter/favicon.png,sha256=9ikXLAmzfQzy2NQps_8CGaZog2FvQrOX8nnSZ0e1UmM,2161
-cucu/reporter/html.py,sha256=2BAZMYbB-xMZdQXZeE8FgWJdWmScGY8JHWaQqiBP03I,19143
+cucu/reporter/html.py,sha256=PhITO1Zxc3WVl1nU7maKpDeUvYmlkkv4cMNTFJnnTxM,19516
 cucu/reporter/templates/feature.html,sha256=IBkwGiul-sRO5lT8q8VFXMUJx1owsAd1YbdDzziSjKw,3645
 cucu/reporter/templates/flat.html,sha256=JGsMq-IWz6YUpJX9hcN65-15HxcX3NJclOmMDtW3HZE,2358
 cucu/reporter/templates/index.html,sha256=xgPYNU-sozN-iOaEzyymoQ4LDRI75eHXngbAP0xDYls,2770
 cucu/reporter/templates/layout.html,sha256=2iDRbm8atO8mgHWgijIvDCrBMKvcP6YHrmr95WtJiE4,4561
-cucu/reporter/templates/scenario.html,sha256=Vgl8A2O_hwG2W6JD5XtJi7xmTTWRe4XyqgfjfB1QmgM,10119
+cucu/reporter/templates/scenario.html,sha256=zxVCBLHqaeai6mcRGbpXmREvNeSAyQrygXLzdF30xb0,11120
 cucu/steps/__init__.py,sha256=seSmASBlWu6-6wbFbvEbPwigBcRXiYP18C4X_2cW8Ng,753
 cucu/steps/base_steps.py,sha256=0fPvdaKoan8lMAKrDnK0-zrALpxm11P1zVAY5CN7iXA,1893
 cucu/steps/browser_steps.py,sha256=iTRl5ffpf2YrFk5qh655WFHAeSOwoE3HFhmXhjsZtao,12687
@@ -88,7 +88,7 @@ cucu/steps/text_steps.py,sha256=Jj_GHoHeemNwVdUOdqcehArNp7WM-WMjljA4w0pLXuw,2576
 cucu/steps/variable_steps.py,sha256=WSctH3_xcxjijGPYZlxp-foC_SIAAKtF__saNtgZJbk,2966
 cucu/steps/webserver_steps.py,sha256=wWkpSvcSMdiskPkh4cqlepWx1nkvEpTU2tRXQmPDbyo,1410
 cucu/utils.py,sha256=LCcs8sMzvdvH05N8P5QYO4lO6j-_PQC530mEAD96go8,10957
-cucu-1.3.7.dist-info/WHEEL,sha256=-neZj6nU9KAMg2CnCY6T3w8J53nx1kFGw_9HfoSzM60,79
-cucu-1.3.7.dist-info/entry_points.txt,sha256=11WRIhQM7LuUnQg1lAoZQoNvvBvYNN1maDgQS4djwJo,40
-cucu-1.3.7.dist-info/METADATA,sha256=odrZlSjtaYwYeWjol9l24U6-UFjMCw3WbSQ_X5dgAEw,16721
-cucu-1.3.7.dist-info/RECORD,,
+cucu-1.3.9.dist-info/WHEEL,sha256=-neZj6nU9KAMg2CnCY6T3w8J53nx1kFGw_9HfoSzM60,79
+cucu-1.3.9.dist-info/entry_points.txt,sha256=11WRIhQM7LuUnQg1lAoZQoNvvBvYNN1maDgQS4djwJo,40
+cucu-1.3.9.dist-info/METADATA,sha256=3vWeUwEJ0WyZAdYNYAktzlhpWg7vWTz0i_cqiLb2tvk,16721
+cucu-1.3.9.dist-info/RECORD,,