From fd2df928b28706230b5ea16ca36d10be5254a92d Mon Sep 17 00:00:00 2001
From: boccioli_m <marco.boccioli@psi.ch>
Date: Fri, 20 Oct 2017 10:33:13 +0200
Subject: [PATCH] Closedown

---
 plugins/TestingList.java              |   8 +++++---
 script/local.py                       |   6 +++---
 script/tests/config/rps-test          | Bin 22298 -> 31166 bytes
 script/tests/devices/bis-BME1/.config |   2 +-
 script/tests/tests.properties         |   2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

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 4f5068d62e88c438caeb71d47f2a1d5f4df8f51a..330035484c07f96e386cf3a1af40e76fab40c97f 100644
GIT binary patch
delta 871
zcmbQWj&a{-#tFrYE)z@C85<@$vP*2-(&EHzWT0SZU}b1*Wo)|H+4&ELh_I1?p}D@H
zfj&aUe6oYjC8H7shC+rq#;Sr61~upW(wr29y!;Y{;?xp_-29YO1tT5LKxcnn9Tg{E
zS3?~`9T!i>&9j1PSSHW+lvZK%1ZnjuVZdg32?L9xucP7QjgIn@UkA<?fLhc6w1_1!
zBT*4%j4BTUX9)vGQf9HPldtn+UuQKgXG47$x7JyX)!DFwL2U9xZ?VbSoRfGNIDwWj
za29~c$rD+WR2e->82B91N>Ymy3W`$8GV@D|!IC8m?CyzqB}J7${YH~FO39c)x%yCA
zFF8LiEi=7@L9(cz80hEZlFa-(g_6vi90iC91!S8y_Xc%>{VfUc_jFWCfFX%&i4oKi
zBf^#db;7+zz!GCrON^nG7!$Sxs1wr?5mcYB`WKXB7EgX}Cq6krj6)C1(+87q^TjYi
z3M`M!a8XplnFBJ@N*J_&@gS?7nWhiq!3`C`Fchp7)4gJ-MnV&f3pmlZz!HtiWKg1U
OL5sQ`7OMhsK?ML<5gZ2q

delta 89
zcmdn@nQ_)S#tFrYwi8R#8674&vP*2-(&EHzXrW+eVr67#Wo)_G+4&C#Bg5oipGyLT
m40VjfV4?s_Zf?k*%fjXbWHWG1<_<c#xhS%Sg{7dNpaK9UnjHxM

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