diff --git a/script/local.py b/script/local.py index ef70bf4..3b380cb 100644 --- a/script/local.py +++ b/script/local.py @@ -72,7 +72,7 @@ class TestingTool: """ import time time.ctime() - now = time.strftime('---%Y.%m.%d %H:%M:%S') + now = time.strftime('%Y.%m.%d %H:%M:%S') logText = self.deviceName + ' - ' + self.testName + ': ' + str(text) print now + ' ' + logText try: @@ -87,13 +87,17 @@ class TestingTool: print now + ' ' + self.deviceName + ' - ' + self.testName + ': ' + 'cannot write Log in Data' - def printParams(self, params): + def printParams(self): """ Print/log the pshell parameters params = the JSON object with the parameters passed by pshell """ columnsFormat = '{0:10} {1:10} {2}' - self.log(columnsFormat.format("cedccewc", "23", "ewfe erfgerf ref erf")) + 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)) def sendFeedback(self, returnString, testPassed): diff --git a/script/tests/tests.properties b/script/tests/tests.properties index da89b49..857577b 100644 --- a/script/tests/tests.properties +++ b/script/tests/tests.properties @@ -1,5 +1,5 @@ #TestingList for pshell: configuration properties -#Tue Aug 29 11:16:44 CEST 2017 +#Tue Aug 29 11:21:12 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 647de5e..1aea8e0 100644 --- a/script/tests/tests/sad/rightleft/rightleft.py +++ b/script/tests/tests/sad/rightleft/rightleft.py @@ -69,7 +69,8 @@ def startTest(testName, DEVICE, params): # test.log("Example - Device name: " + test.getDeviceName() ) try: test.log("Running test with the following parameters:") - test.printParams(params) + test.log(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. delay = float(test.getParam('delay')) ; centre = float(test.getParam('centre')) ; moveAround = float(test.getParam('moveAround')) ; steps = float(test.getParam('steps')) ;