From b1f1d13323ad37382d167669b0c0fc44981b4329 Mon Sep 17 00:00:00 2001 From: boccioli_m Date: Fri, 20 Oct 2017 15:34:39 +0200 Subject: [PATCH] Closedown --- script/tests/config/rps-test | Bin 58007 -> 58005 bytes script/tests/tests.properties | 2 +- .../Betriebsmode/help.html | 2 +- .../Diagnostic/Diagnostic.py | 2 +- .../RPS Tests Diagnostic/Diagnostic/help.html | 7 +++++-- .../RPSlimits/RPSlimits.py | 4 ++-- .../RPSlimits/help.html | 2 +- 7 files changed, 11 insertions(+), 8 deletions(-) diff --git a/script/tests/config/rps-test b/script/tests/config/rps-test index 4834d8544823f0b4465ec791635c52e71482de3b..ff58d1318ce22f5dec0f029699a0f08b72c406bf 100644 GIT binary patch delta 721 zcmbP!lzHk=<_+%xCogd1ncN(Hg{QHQp^mY!08CDv$f7j)L6z`ihfUx&#s zrYdaiDVWU4cxAIf*&&w69|E6qJ}M|-U`fnKRNTC=Z6?cP{Ze5@hRHvwj_@+R0=f4U z*wwFqk_%aw7++1!X}~4(pcR))NH;E-6BBUB*i6GEvtc$i87{_GB@FBlzOIHQlMD7J zPxfCp6Ne9GEW@TB1Y74Q+_)xJ2UoR(+{%q&Oux<0mre)!0dE3 kFq`afNoDefGc$1b)8Y~~{UAHnT*oD&a2H+XC8XUD_U zhooHKf?89;pgP&mS7x(U>N1GFH!wSNeU&z|W=~{geN+Hbw7p;v%jADSf~-KtF>p@) zR&|7zffLLIIhTQR^MQi7ERzpRU||BvW;NiGz1NCMmWP3}gn>Q6*U`|>&~#F@>g2}m zsd%h8HUXDGAV*kD!za6LHZED1BU}wl3=JkPSf)BTa3MZdOk0M_B#

Description

-Verify that the different RPS Modes give correct Outputs on the RPS modules +Verify that the different RPS Modes give correct Outputs on the RPS modules (Test n. 1 in old caRPS_Tests)

Parameters

diff --git a/script/tests/tests/RPS Tests Diagnostic/Diagnostic/Diagnostic.py b/script/tests/tests/RPS Tests Diagnostic/Diagnostic/Diagnostic.py index fc7066f..8abf082 100644 --- a/script/tests/tests/RPS Tests Diagnostic/Diagnostic/Diagnostic.py +++ b/script/tests/tests/RPS Tests Diagnostic/Diagnostic/Diagnostic.py @@ -110,7 +110,7 @@ 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: - ret = "Example - Test successful, here some detail: ..." + ret = "Success, nothing was done :-)" success = True # once the test is finished, no need to do anything. The code below yours will do the rest. ################ End of Example ########## diff --git a/script/tests/tests/RPS Tests Diagnostic/Diagnostic/help.html b/script/tests/tests/RPS Tests Diagnostic/Diagnostic/help.html index 9391d6f..c2f029f 100644 --- a/script/tests/tests/RPS Tests Diagnostic/Diagnostic/help.html +++ b/script/tests/tests/RPS Tests Diagnostic/Diagnostic/help.html @@ -2,11 +2,14 @@

Description

-Test interlocks of diagnostic modules by generating a pulse +Test interlocks of diagnostic modules by generating a pulse (Test n. 5 in old caRPS_Tests)

Parameters

mode [string] Betriebs mode
- + + + +
setGetDelay [s] delay between set and get
rpsAttributeRPS EPICS attribute
rpsModuleRPS module EPICS channel name
expectedValue2[hex] expected value 2
expectedValue1[hex] expected value 1

Contact

Marco Boccioli
diff --git a/script/tests/tests/RPS Tests Interlocklilmits/RPSlimits/RPSlimits.py b/script/tests/tests/RPS Tests Interlocklilmits/RPSlimits/RPSlimits.py index cbe8a8e..317e2cb 100644 --- a/script/tests/tests/RPS Tests Interlocklilmits/RPSlimits/RPSlimits.py +++ b/script/tests/tests/RPS Tests Interlocklilmits/RPSlimits/RPSlimits.py @@ -69,7 +69,7 @@ def startTest(testName, DEVICE, params): try: test.log("Running test with the following parameters:") test.printParams() - ret = 'aha!' + ret = 'Success, nothing was done :-)' success = True test.sendFeedback(ret, success) return @@ -159,7 +159,7 @@ def startTest(testName, DEVICE, params): #ilkInCh.close() #ilkOutCh.close() - ret = "Example - Test successful, here some detail: ..." + ret = "Success, because..." success = True ################ End of Example ########## diff --git a/script/tests/tests/RPS Tests Interlocklilmits/RPSlimits/help.html b/script/tests/tests/RPS Tests Interlocklilmits/RPSlimits/help.html index c05d24a..7a07635 100644 --- a/script/tests/tests/RPS Tests Interlocklilmits/RPSlimits/help.html +++ b/script/tests/tests/RPS Tests Interlocklilmits/RPSlimits/help.html @@ -2,7 +2,7 @@

Description

-Interlock Limits for Ablenksmagnet +Interlock Limits for Ablenksmagnet (Test n. 2 in old caRPS_Tests)

Parameters

ilkInExpectedValS [hex] Interlock Input expected value for small values of magnet