From edc2cfbb19535decad4fe375aa33fe5636f274ee Mon Sep 17 00:00:00 2001 From: boccioli_m Date: Fri, 13 Oct 2017 13:40:03 +0200 Subject: [PATCH] Closedown --- script/local.py | 2 +- script/tests/templates/testTemplate.py | 2 ++ script/tests/tests.properties | 2 +- .../RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py | 5 ++++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/script/local.py b/script/local.py index 931d32c..30da5cc 100644 --- a/script/local.py +++ b/script/local.py @@ -93,7 +93,7 @@ class TestingTool: Print/log the pshell parameters params = the JSON object with the parameters passed by pshell """ - columnsFormat = '{0:20} {1:>7} {2}' + columnsFormat = '{0:17} {1:>15} {2}' self.log(columnsFormat.format("Parameter", "Value", "Description")) for key in self.testParams.keys(): self.log(columnsFormat.format(key, diff --git a/script/tests/templates/testTemplate.py b/script/tests/templates/testTemplate.py index ef05db7..202d4fd 100644 --- a/script/tests/templates/testTemplate.py +++ b/script/tests/templates/testTemplate.py @@ -74,6 +74,7 @@ def startTest(testName, DEVICE, params): # These parameters were automatically generated: you might need to change the casting. #$testParameters except: + import traceback # test failed, write the report into the variables ret and success and send feedback: ret = 'Could not retrieve testing parameters - ' + traceback.format_exc() success = False @@ -111,6 +112,7 @@ def startTest(testName, DEVICE, params): pv_motor_val = Channel(test.getDeviceName() + ':IST:1' , type='d') pv_motor_com = Channel(test.getDeviceName() + ':COM:2' , type='d') except: + import traceback # prepare return information: return text: ret = 'Unable to create channel - ' + traceback.format_exc() # prepare return information: return success: diff --git a/script/tests/tests.properties b/script/tests/tests.properties index 0404656..2b5ad19 100644 --- a/script/tests/tests.properties +++ b/script/tests/tests.properties @@ -1,5 +1,5 @@ #TestingList for pshell: configuration properties -#Fri Oct 13 13:32:59 CEST 2017 +#Fri Oct 13 13:38:39 CEST 2017 customPanel= showEnabledTestsOnly= listFilter=rps-try diff --git a/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py b/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py index 5953939..83a2c8c 100644 --- a/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py +++ b/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py @@ -72,8 +72,10 @@ def startTest(testName, DEVICE, params): test.printParams() # If present, use the parameters here below for your test script. # These parameters were automatically generated: you might need to change the casting. - mode = string(test.getParam('mode')) ; expectedVal14 = int(test.getParam('expectedVal14')) ; expectedVal58 = int(test.getParam('expectedVal58')) ; setGetDelay = float(test.getParam('setGetDelay')) ; + mode = (test.getParam('mode')) ; expectedVal14 = (test.getParam('expectedVal14')) ; expectedVal58 = (test.getParam('expectedVal58')) ; setGetDelay = (test.getParam('setGetDelay')) ; + test.log("mode: " + mode + " expectedVal14: " +expectedVal14) except: + import traceback # test failed, write the report into the variables ret and success and send feedback: ret = 'Could not retrieve testing parameters - ' + traceback.format_exc() success = False @@ -111,6 +113,7 @@ def startTest(testName, DEVICE, params): pv_motor_val = Channel(test.getDeviceName() + ':IST:1' , type='d') pv_motor_com = Channel(test.getDeviceName() + ':COM:2' , type='d') except: + import traceback # prepare return information: return text: ret = 'Unable to create channel - ' + traceback.format_exc() # prepare return information: return success: