fix done in XML report generation, to standardize outputs when runnin…

…g in parallel and with a unique process
hrcorval · Sep 18, 2024 · a87d239 · a87d239
1 parent c256c00
commit a87d239
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 28 deletions.
diff --git a/behavex/outputs/jinja/xml.jinja2 b/behavex/outputs/jinja/xml.jinja2
@@ -25,21 +25,21 @@
 {%- macro print_scenario(scenario) -%}
 {%- set scenario_tags = scenario|get_scenario_tags-%}
 {%- set is_muted = ('MUTE' in scenario_tags and scenario.status == 'failed')-%}
-{%- set scenario_crashed = True if (scenario.status == 'failed' and not scenario.error_background and not scenario.error_step) else False -%}
 {%- set errors_step = 0-%}
         {%- for step in scenario.steps -%}
             {%- set errors_step = errors_step + (0 if step.error_message else 1) -%}
         {%- endfor -%}
         <testcase time="{{ scenario.duration }}" name={{scenario.name|normalize|CIXC|quoteattr|safe}} status="{{ scenario.status if not is_muted else 'skipped'}}"
          classname={{scenario.feature.name|normalize|CIXC|quoteattr|safe }}>
             {%- set steps_with_exception = scenario.steps|get_list_exception_steps(scenario._background_steps) -%}
+            {%- set scenario_crashed = True if (scenario.status == 'failed' and steps_with_exception|length == 0) else False -%}
             {%- if scenario_crashed and not is_muted -%}
-                    <failure type=Exception message={{scenario.error_msg|get_error_message|CIXC|quoteattr|safe }}>
-                        <![CDATA[ {{ scenario.error_msg }} ]]>
-                    </failure>
+                <failure type=Exception message={{scenario.error_msg|get_error_message|CIXC|quoteattr|safe }}>
+                    <![CDATA[ {{ scenario.error_msg }} ]]>
+                </failure>
             {%- elif steps_with_exception and not is_muted -%}
                 {%- for step in steps_with_exception -%}
-                    <failure type={{ step.exception.__class__.__name__ |normalize|CIXC|quoteattr|safe}} message={{step.exception.message|get_error_message|CIXC|quoteattr|safe }}>
+                    <failure type={{ step.exception.__class__.__name__ |normalize|CIXC|quoteattr|safe}} message={{ step.exception|string|get_error_message|CIXC|quoteattr|safe}}>
                         <![CDATA[ Failing step: {{step|print_step|safe}} Location:{{step.filename|normalize|safe}}
                          {{step|get_lines_exception|safe}}
                         ]]>

diff --git a/behavex/outputs/jinja/xml_json.jinja2 b/behavex/outputs/jinja/xml_json.jinja2
@@ -20,7 +20,7 @@
             {{'\n'}}
         {%- endfor -%}
     {%- endif -%}
-        {{ 16*' ' ~ step|print_step_json ~ '\n'}}
+        {{ 16*' ' ~ step|print_step_json|safe ~ '\n'}}
 {%- endmacro -%}
 {%- macro print_scenario(scenario) -%}
 {%- set scenario_tags = scenario|get_scenario_tags-%}
@@ -30,13 +30,13 @@
          classname={{scenario.feature|normalize|CIXC|quoteattr|safe }} >
             {% set step_with_exception = scenario.error_step %}
             {%- if scenario_crashed and not is_muted -%}
-                    <failure type=Exception message={{scenario.error_msg|get_error_message|CIXC|quoteattr|safe }}>
-                        <![CDATA[ {{ scenario.error_msg }} ]]>
-                    </failure>
+                <failure type="Exception" message={{scenario.error_msg|get_error_message|CIXC|quoteattr|safe }}>
+                    <![CDATA[ {{ scenario.error_msg }} ]]>
+                </failure>
             {%- elif step_with_exception and not is_muted -%}
-                <failure message={{step_with_exception.error_msg|get_error_message|CIXC|quoteattr|safe }} type="AssertionError">
-                    <![CDATA[ Failing step: {{step_with_exception|print_step_json|safe}} Location:{{step_with_exception.index}}
-                        {{step_with_exception|safe}}
+                <failure type="AssertionError" message={{step_with_exception.error_msg|get_error_message|CIXC|quoteattr|safe }}>
+                    <![CDATA[ Failing step: {{step_with_exception|print_step_json|safe}} Location:{{feature["filename"]}}
+                        {{step_with_exception|get_lines_exception|safe}}
                     ]]>
                 </failure>
             {%- endif -%}

diff --git a/behavex/outputs/jinja_mgr.py b/behavex/outputs/jinja_mgr.py
@@ -163,7 +163,11 @@ def _print_step_json(step):
 
 
 def get_lines_exception(step):
-    if step.exception:
+    if type(step) is dict:
+        return u'\n'.join(
+            [16 * u' ' + line for line in step['error_lines']]
+        ).strip()
+    elif step.exception:
         return u'\n'.join(
             [16 * u' ' + line for line in traceback.format_tb(step.exc_traceback)]
         ).strip()
@@ -192,8 +196,8 @@ def _get_path_log(scenario):
         return path_logs
 
 
-def _quoteattr(string):
-    return "''" if not string else quoteattr(string)
+def _quoteattr(string_to_quote):
+    return "''" if not string_to_quote else quoteattr(string_to_quote)
 
 
 def _print_tag_xml(tags):

diff --git a/behavex/outputs/report_utils.py b/behavex/outputs/report_utils.py
@@ -335,23 +335,22 @@ def create_log_path(name, execution_retry=False):
     return path
 
 
-def get_error_message(message_error):
-    if not message_error:
+def get_error_message(error_message):
+    if not error_message:
         return u''
-    if isinstance(message_error, Exception):
-        if hasattr(message_error, 'message'):
+    if isinstance(error_message, Exception):
+        if hasattr(error_message, 'message'):
             # noinspection PyBroadException
             try:
-                message_error = traceback.format_tb(message_error.message)
+                error_message = traceback.format_tb(error_message.message)
             except BaseException:
-                message_error = repr(message_error.message)
-        if hasattr(message_error, 'exc_traceback'):
-            message_error = traceback.format_tb(message_error.exc_traceback)
-    elif not isinstance(message_error, str):
-        message_error = repr(message_error)
-    return u'\n'.join(
-        [16 * u' ' + line for line in text(message_error).split('\n')]
-    ).strip()
+                error_message = repr(error_message.message)
+        if hasattr(error_message, 'exc_traceback'):
+            error_message = traceback.format_tb(error_message.exc_traceback)
+    elif not isinstance(error_message, str):
+        error_message = repr(error_message)
+    formatted_error = u'\n'.join([16 * u' ' + line for line in text(error_message).split('\n')]).strip()
+    return formatted_error
 
 
 def text(value, encoding=None, errors=None):