diff --git a/plugins/TestingList.java b/plugins/TestingList.java index d97c475..8427645 100644 --- a/plugins/TestingList.java +++ b/plugins/TestingList.java @@ -678,7 +678,7 @@ public class TestingList extends Panel { logger.addHandler(fh); SimpleFormatter formatter = new SimpleFormatter(); fh.setFormatter(formatter); - log("INFO - " + "New testing session"); + log("INF - " + "New testing session"); } catch (SecurityException e) { SwingUtils.showMessage(this, "initLogger()", e.toString()); } catch (IOException e) { @@ -1715,7 +1715,7 @@ public class TestingList extends Panel { case "Success": icon = TestStatus.SUCCESS.Icon(); logger.log(Level.INFO, sStatus + " - Device: " + deviceName + "; Test: " + sTestName + "; Result: " + res); - log("INFO - " + sStatus + " - Device: " + deviceName + "; Test: " + sTestName + "; Result: " + res); + log("INF - " + sStatus + " - Device: " + deviceName + "; Test: " + sTestName + "; Result: " + res); break; case "Failure": icon = TestStatus.FAILURE.Icon(); @@ -1748,7 +1748,9 @@ public class TestingList extends Panel { */ public void updateResultSummary() { ImageIcon summaryIcon = null; - if(countFailureTests()>0){ + if(countRunningTests()>0){ + summaryIcon = TestStatus.RUNNING.Icon(); + } else if(countFailureTests()>0){ summaryIcon = TestStatus.FAILURE.Icon(); } else if(countSuccessTests()>0){ summaryIcon = TestStatus.SUCCESS.Icon(); diff --git a/script/local.py b/script/local.py index ec3c811..0fd6314 100644 --- a/script/local.py +++ b/script/local.py @@ -69,12 +69,12 @@ class TestingTool: """ Print/log information text = the string to be printed/logged - severity = 0:Info 1:Warning 2:Error + severity = 0:Info, 1:Warning, 2:Error """ import time time.ctime() now = time.strftime('%Y.%m.%d %H:%M:%S') - sev = ['INFO','WARN','ERRO'] + sev = ['INF','WAR','ERR'] logText = sev[severity] + ' - ' + self.deviceName + ' ' + self.testName + ': ' + str(text) print now + ' ' + logText try: @@ -86,7 +86,7 @@ class TestingTool: log(logText) except: #cannot write log - print now + ' ' + self.deviceName + ' - ' + self.testName + ': ' + 'cannot write Log in Data' + print now + ' ' + sev[2] + ' - ' + self.deviceName + ' ' + self.testName + ': ' + 'cannot write Log in Data' def printParams(self): diff --git a/script/tests/config/rps-test b/script/tests/config/rps-test index 4f5068d..3300354 100644 Binary files a/script/tests/config/rps-test and b/script/tests/config/rps-test differ diff --git a/script/tests/devices/bis-BME1/.config b/script/tests/devices/bis-BME1/.config index a8d8e5c..6ae20bb 100644 --- a/script/tests/devices/bis-BME1/.config +++ b/script/tests/devices/bis-BME1/.config @@ -1,5 +1,5 @@ #Wed Oct 18 10:54:16 CEST 2017 name=bis-BME1 tests=RPS Tests Betriebsmode -description=rps section till BMA1 +description=rps section till BME1 parameters=mode&"2,IQCOM,$BME1,1,DIA"&"betriebsmode";expectedVal14&"0x0000"&"[hex] Expected value for channels 1-4";expectedVal58&"0x0000"&"[hex] Expected value for channels 5-8"; diff --git a/script/tests/tests.properties b/script/tests/tests.properties index 818390f..58ca813 100644 --- a/script/tests/tests.properties +++ b/script/tests/tests.properties @@ -1,5 +1,5 @@ #TestingList for pshell: configuration properties -#Fri Oct 20 10:07:20 CEST 2017 +#Fri Oct 20 10:32:03 CEST 2017 customPanel= showEnabledTestsOnly=true listFilter=rps-test