diff --git a/script/tests/tests.properties b/script/tests/tests.properties index 9b499a1..0f7cd8a 100644 --- a/script/tests/tests.properties +++ b/script/tests/tests.properties @@ -1,5 +1,5 @@ #TestingList for pshell: configuration properties -#Wed Aug 30 14:56:08 CEST 2017 +#Wed Aug 30 15:02:24 CEST 2017 customPanel= showEnabledTestsOnly=true -listFilter=test-bx84 +listFilter=rps-try diff --git a/script/tests/tests/sad/rpstry/.config b/script/tests/tests/sad/rpstry/.config index 3482957..d0a106f 100644 --- a/script/tests/tests/sad/rpstry/.config +++ b/script/tests/tests/sad/rpstry/.config @@ -1,4 +1,4 @@ -#Wed Aug 30 10:33:46 CEST 2017 +#Wed Aug 30 15:00:32 CEST 2017 name=rpstry +parameters=delay\:.2\:delay between 2 steps;setVal\:10\:value to set;expectedVal\:18.2\:expected returned value;mask\:2\:bit mask; description=try to use pshell for rps test -parameters=delay\:.2\:delay between 2 steps;setVal\:10\:value to set;expectedVal\:18.1859485365\:expected returned value;mask\:2\:bit mask; diff --git a/script/tests/tests/sad/rpstry/rpstry.py b/script/tests/tests/sad/rpstry/rpstry.py index 710f127..bd6f01c 100644 --- a/script/tests/tests/sad/rpstry/rpstry.py +++ b/script/tests/tests/sad/rpstry/rpstry.py @@ -108,11 +108,11 @@ def startTest(testName, DEVICE, params): # IMPORTANT: if the test was successful, write the report into the variables ret and success. # for example, write the following: - if motor_sta == expectedVal: - ret = "Test successful, val returned as expected: " + str(motor_sta) + if motor_sta <= expectedVal: + ret = "Test successful, val returned: " + str(motor_sta) + " is below limit: " + str(expectedVal) success = True else: - ret = "Test failed, val expected: " + str(expectedVal) + " ; val received: " + str(motor_sta) + ret = "Test failed, val received: " + str(motor_sta) + " is above the limit: " + str(expectedVal) success = False # once the test is finished, no need to do anything. The code below yours will do the rest. ################ End of Example ##########