From 84b317c70c596da36c20b1a8d2a977f989325be3 Mon Sep 17 00:00:00 2001
From: boccioli_m <marco.boccioli@psi.ch>
Date: Fri, 4 Sep 2015 16:25:31 +0200
Subject: [PATCH] user stop handling messages logged in Data log amound of
 messages reduced

---
 plugins/TestingList.java                      |   5 ++---
 script/tests/config/LabTests                  | Bin 6158 -> 8463 bytes
 script/tests/templates/testTemplate.py        |   5 +++++
 .../PS Tests/power-supply-A/power-supply-A.py |   5 +++++
 .../PS Tests/power-supply-B/power-supply-B.py |   5 +++++
 .../test without ioc/test without ioc.py      |   5 +++++
 6 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index 8923cdb..94f7a58 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -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) {
diff --git a/script/tests/config/LabTests b/script/tests/config/LabTests
index 5721c11c8c07fea5b1edbcf94ec2ca18ee6c1f14..66762d6e4be5215d19b706dd4799554dcb4ab1df 100644
GIT binary patch
delta 325
zcmeA(=y%${%r4GY!ocU4R+3tzP*9XwmYH8#T*y$zz%}^*pV#Iv_DZJB<^090f*K_Z
zyy2N88E{3L|8P!XVgsu+oa`fz#R}48zWIcJ4$J0kJW7m{tyuK9T|k1aAi{03AYaAg
z4=nN`7$%i4FaRxEDIN$?7gzu$L4*NT!x;l7e-)X*22ngYnYREa5HGGP02YV=>5Bys
iag!azGI@}V#IEYISOO8M=7`6NBAW%WL9n2rpaK9uw_i&D

delta 270
zcmeBo>ND8D%+A74!oaXul>G$L<cZAcY#N0Obqt!D6Zt1GP5#It2jfo=Q)6T_0EtLJ
zRDhImfd~r_VF@CvCchW204tK3{FjY$axlLTBj@B<5-WK)LDHNBU~=<q&QjLN{H$C+
zxo@&F*dTI~9mNZP0tpJb0$_nKklJt%5i!|GJ`=?R?5e)VClH}(u0pIRvTHy#2o_Wn
GQ~&^u%|+?}

diff --git a/script/tests/templates/testTemplate.py b/script/tests/templates/testTemplate.py
index 1a8ff16..86bdb8e 100644
--- a/script/tests/templates/testTemplate.py
+++ b/script/tests/templates/testTemplate.py
@@ -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()
diff --git a/script/tests/tests/PS Tests/power-supply-A/power-supply-A.py b/script/tests/tests/PS Tests/power-supply-A/power-supply-A.py
index dc2fa57..7d31f26 100644
--- a/script/tests/tests/PS Tests/power-supply-A/power-supply-A.py	
+++ b/script/tests/tests/PS Tests/power-supply-A/power-supply-A.py	
@@ -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()
diff --git a/script/tests/tests/PS Tests/power-supply-B/power-supply-B.py b/script/tests/tests/PS Tests/power-supply-B/power-supply-B.py
index e5826b9..8f4baaa 100644
--- a/script/tests/tests/PS Tests/power-supply-B/power-supply-B.py	
+++ b/script/tests/tests/PS Tests/power-supply-B/power-supply-B.py	
@@ -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()
diff --git a/script/tests/tests/PS Tests/test without ioc/test without ioc.py b/script/tests/tests/PS Tests/test without ioc/test without ioc.py
index 0483998..582614b 100644
--- a/script/tests/tests/PS Tests/test without ioc/test without ioc.py	
+++ b/script/tests/tests/PS Tests/test without ioc/test without ioc.py	
@@ -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()