From 8dc903b6383b4dae797d9df70700f07e76d9065e Mon Sep 17 00:00:00 2001 From: boccioli_m Date: Tue, 29 Aug 2017 11:25:49 +0200 Subject: [PATCH] Closedown --- script/local.py | 6 +++--- script/tests/tests.properties | 2 +- script/tests/tests/sad/rightleft/rightleft.py | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/script/local.py b/script/local.py index 3b380cb..76c2927 100644 --- a/script/local.py +++ b/script/local.py @@ -95,9 +95,9 @@ class TestingTool: columnsFormat = '{0:10} {1:10} {2}' self.log(columnsFormat.format("Parameter", "Value", "Description")) for param in self.testParams: - self.log(columnsFormat.format(self.testParams[param], - self.testParams[param].value, - self.testParams[param].description)) + self.log(columnsFormat.format(param, + param.value, + param.description)) def sendFeedback(self, returnString, testPassed): diff --git a/script/tests/tests.properties b/script/tests/tests.properties index 4715393..cc1bbc2 100644 --- a/script/tests/tests.properties +++ b/script/tests/tests.properties @@ -1,5 +1,5 @@ #TestingList for pshell: configuration properties -#Tue Aug 29 11:22:40 CEST 2017 +#Tue Aug 29 11:25:02 CEST 2017 customPanel= showEnabledTestsOnly=true listFilter=test-bx84 diff --git a/script/tests/tests/sad/rightleft/rightleft.py b/script/tests/tests/sad/rightleft/rightleft.py index 1aea8e0..303ed06 100644 --- a/script/tests/tests/sad/rightleft/rightleft.py +++ b/script/tests/tests/sad/rightleft/rightleft.py @@ -76,6 +76,7 @@ def startTest(testName, DEVICE, params): delay = float(test.getParam('delay')) ; centre = float(test.getParam('centre')) ; moveAround = float(test.getParam('moveAround')) ; steps = float(test.getParam('steps')) ; except: # test failed, write the report into the variables ret and success and send feedback: + import traceback ret = 'Could not retrieve testing parameters - ' + traceback.format_exc() success = False test.sendFeedback(ret, success) @@ -121,6 +122,7 @@ def startTest(testName, DEVICE, params): pv_motor_val = Channel(test.getDeviceName() + ':ai' , type='d') except: # prepare return information: return text: + import traceback ret = 'Unable to create channel - ' + traceback.format_exc() # prepare return information: return success: success = False