pshell_config/ncs
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

user stop handling

Browse Source 
messages logged in Data log
amound of messages reduced
This commit is contained in:
boccioli_m
2015-09-04 16:25:31 +02:00
parent 67d985aa17
commit 84b317c70c
6 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/TestingList.java
View File

@@ -1579,8 +1579,7 @@ public class TestingList extends Panel {
}
}
//System.out.println(sParallelizeCommand);
Object ret;
ret = eval(sParallelizeCommand);
Object ret = eval(sParallelizeCommand);
//System.out.println(ret);
String sTestResult, sTestStatus;
if(ret == null){
@@ -1618,7 +1617,7 @@ public class TestingList extends Panel {
} catch (StatementException intEx) {
Logger.getLogger(TestingList.class.getName()).log(Level.SEVERE, null, intEx);
System.out.println("User interrupted test! |"+ sDeviceName+"|"+ sTestPath+"|"+ String.valueOf(intEx));
stopAll("User interrupted test");
stopAll("Test stopped by user");
//showResult(sDeviceName, sTestPath, "User interrupted test", "false");
//setToStopped();
} catch (ClassCastException ccex) {

BIN
script/tests/config/LabTests
View File

Binary file not shown.

5
script/tests/templates/testTemplate.py
View File

@@ -125,6 +125,11 @@ def startTest(testName, DEVICE, params):
#just in case the feedback was forgotten
test.sendFeedback(ret, success)
except (KeyboardInterrupt):
#user stop error handler
ret = 'Test stopped by user.'
success = False
test.sendFeedback(ret, success)
except:
#generic error handler
ret = traceback.format_exc()

5
script/tests/tests/PS Tests/power-supply-A/power-supply-A.py
View File

@@ -100,6 +100,11 @@ def startTest(testName, DEVICE, params):
#just in case the feedback was forgotten
test.sendFeedback(ret, success)
except (KeyboardInterrupt):
#user stop error handler
ret = 'Test stopped by user.'
success = False
test.sendFeedback(ret, success)
except:
#generic error handler
ret = traceback.format_exc()

5
script/tests/tests/PS Tests/power-supply-B/power-supply-B.py
View File

@@ -95,6 +95,11 @@ def startTest(testName, DEVICE, params):
#just in case the feedback was forgotten
test.sendFeedback(ret, success)
except (KeyboardInterrupt):
#user stop error handler
ret = 'Test stopped by user.'
success = False
test.sendFeedback(ret, success)
except:
#generic error handler
ret = traceback.format_exc()

5
script/tests/tests/PS Tests/test without ioc/test without ioc.py
View File

@@ -136,6 +136,11 @@ def startTest(testName, DEVICE, params):
#just in case the feedback was forgotten
test.sendFeedback(ret, success)
except (KeyboardInterrupt):
#user stop error handler
ret = 'Test stopped by user.'
success = False
test.sendFeedback(ret, success)
except:
#generic error handler
ret = traceback.format_exc()