Closedown

This commit is contained in:
boccioli_m
2017-10-20 10:33:13 +02:00
parent bc81020970
commit fd2df928b2
5 changed files with 10 additions and 8 deletions

View File

@@ -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();

View File

@@ -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):

Binary file not shown.

View File

@@ -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";

View File

@@ -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