Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-17 14:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a way to stop if fail step and improve report accordingly

Browse Source
This commit is contained in:
Roch Bertucat
2020-12-18 11:22:14 +01:00
parent e01b677845
commit 9ffc2874da
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcbimtester/bimtester/features/environment.py
+1 -1
View File
@@ -3,5 +3,5 @@ from behave.model import Scenario
def before_all(context): def before_all(context):
userdata = context.config.userdata userdata = context.config.userdata
continue_after_failed = True continue_after_failed = userdata.getbool("runner.continue_after_failed_step", True)
Scenario.continue_after_failed_step = continue_after_failed Scenario.continue_after_failed_step = continue_after_failed
src/ifcbimtester/bimtester/reports.py
+21 -6
View File
@@ -4,8 +4,8 @@ import os
import pystache import pystache
def generate_report(adir="."): def generate_report(adir=".", use_report_folder=True, report_file_name="", html_template_file_path=""):
print("# Generating HTML reports now.") #print("# Generating HTML reports now.")
# get html template # get html template
html_template_file = os.path.join( html_template_file = os.path.join(
@@ -13,11 +13,20 @@ def generate_report(adir="."):
"features/template.html" "features/template.html"
) )
if html_template_file_path:
html_template_file = os.path.join(html_template_file_path, "template.html")
# get report file # get report file
report_dir = os.path.join(adir, "report") report_dir = adir
if use_report_folder:
report_dir = os.path.join(adir, "report")
if not os.path.exists(report_dir): if not os.path.exists(report_dir):
return print("No report directory was found.") return print("No report directory was found.")
report_path = os.path.join(report_dir, "report.json")
if report_file_name:
report_path = os.path.join(report_dir, report_file_name)
else:
report_path = os.path.join(report_dir, "report.json")
# print(report_path) # print(report_path)
if not os.path.exists(report_path): if not os.path.exists(report_path):
return print("No report data was found.") return print("No report data was found.")
@@ -58,7 +67,12 @@ def generate_report(adir="."):
if "match" in step and "arguments" in step["match"]: if "match" in step and "arguments" in step["match"]:
for a in step["match"]["arguments"]: for a in step["match"]["arguments"]:
name = name.replace(a["value"], "<b>" + a["value"] + "</b>") name = name.replace(a["value"], "<b>" + a["value"] + "</b>")
if "result" not in step or step["result"]["status"] == "undefined": if "result" not in step:
step["result"] = {}
step["result"]["status"] = "skipped"
step["result"]["duration"] = 0
step["result"]["error_message"] = "This requirement has been skipped due to a previous failing step."
elif step["result"]["status"] == "undefined":
step["result"] = {} step["result"] = {}
step["result"]["status"] = "undefined" step["result"]["status"] = "undefined"
step["result"]["duration"] = 0 step["result"]["duration"] = 0
@@ -68,7 +82,8 @@ def generate_report(adir="."):
"name": name, "name": name,
"time": round(step["result"]["duration"], 2), "time": round(step["result"]["duration"], 2),
"is_success": step["result"]["status"] == "passed", "is_success": step["result"]["status"] == "passed",
"is_unspecified": "result" not in step or step["result"]["status"] == "undefined", "is_unspecified": step["result"]["status"] == "undefined",
"is_skipped": step["result"]["status"] == "skipped",
"error_message": None "error_message": None
if step["result"]["status"] == "passed" if step["result"]["status"] == "passed"
else step["result"]["error_message"], else step["result"]["error_message"],