From 5d6334b174760dd75b4d89190b8c66346847cb84 Mon Sep 17 00:00:00 2001 From: damies13 Date: Sun, 19 Jan 2025 22:51:33 +1000 Subject: [PATCH] Found a bug, wasn't loading colours from template Thanks to the test cases for Issue #307 --- Tests/Regression/Reporter/GUI_Features.robot | 1 + rfswarm_reporter/rfswarm_reporter.py | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/Tests/Regression/Reporter/GUI_Features.robot b/Tests/Regression/Reporter/GUI_Features.robot index b2e332e7d..a4558dc12 100644 --- a/Tests/Regression/Reporter/GUI_Features.robot +++ b/Tests/Regression/Reporter/GUI_Features.robot @@ -1000,6 +1000,7 @@ Change Line Colour Click Tab Preview + Sleep 1 Take A Screenshot [Teardown] Run Keywords diff --git a/rfswarm_reporter/rfswarm_reporter.py b/rfswarm_reporter/rfswarm_reporter.py index c0af32dcb..4325d2dae 100644 --- a/rfswarm_reporter/rfswarm_reporter.py +++ b/rfswarm_reporter/rfswarm_reporter.py @@ -854,6 +854,16 @@ def template_open(self, filename): base.report = configparser.ConfigParser() base.report.read(filename, encoding="utf8") + base.debugmsg(7, "base.report: ", base.report) + if "Colours" in base.report: + base.debugmsg(7, "base.report[Colours]: ", base.report["Colours"]) + if "defcolours" in base.report["Colours"]: + base.defcolours = base.whitespace_get_ini_value(base.report["Colours"]["defcolours"]).split(",") + base.debugmsg(7, "base.defcolours: ", base.defcolours) + if "namecolours" in base.report["Colours"]: + base.namecolours = base.whitespace_get_ini_value(base.report["Colours"]["namecolours"]).split(",") + base.debugmsg(7, "base.namecolours: ", base.namecolours) + base.report_item_set_changed_all("TOP") else: @@ -901,11 +911,15 @@ def report_open(self): base.debugmsg(7, "report_save") base.report_save() + base.debugmsg(7, "base.report: ", base.report) if "Colours" in base.report: + base.debugmsg(7, "base.report[Colours]: ", base.report["Colours"]) if "defcolours" in base.report["Colours"]: base.defcolours = base.whitespace_get_ini_value(base.report["Colours"]["defcolours"]).split(",") + base.debugmsg(7, "base.defcolours: ", base.defcolours) if "namecolours" in base.report["Colours"]: base.namecolours = base.whitespace_get_ini_value(base.report["Colours"]["namecolours"]).split(",") + base.debugmsg(7, "base.namecolours: ", base.namecolours) def report_starttime(self): if "starttime" in self.reportdata and self.reportdata["starttime"] > 0: