Revision: 3647
Author: pekka.klarck
Date: Fri May 28 07:46:43 2010
Log: fixed to work on windows
http://code.google.com/p/robotframework/source/detail?r=3647

Modified:
 /trunk/atest/robot/running/stopping_with_signal.txt

=======================================
--- /trunk/atest/robot/running/stopping_with_signal.txt Fri May 28 01:05:25 2010 +++ /trunk/atest/robot/running/stopping_with_signal.txt Fri May 28 07:46:43 2010
@@ -65,10 +65,11 @@

 *** Key Words ***
 Start And Send Signal
-    [timeout]  2 minutes
+    # Timeouts and signals apparently don't work on Windows
+    # [timeout]  2 minutes
[arguments] ${testcase file} ${signal method} ${signal} ${teardown sleep}
     ${is_jython_in_use} =  Running On Jython  ${INTERPRETER}
- ${test signal file} = catenate SEPARATOR=_ robot_signal_test_started %{USER} ${INTERPRETER} .txt + ${test signal file} = catenate SEPARATOR=_ robot_signal_test_started ${INTERPRETER} .txt
     Remove File  ${TEMPDIR}/${test signal file}
Run Keyword unless ${is_jython_in_use} Start Running Robot ${test signal file} running/stopping_with_signal/${testcase file} ${teardown sleep} Run Keyword if ${is_jython_in_use} Start Running jybot ${test signal file} running/stopping_with_signal/${testcase file} ${teardown sleep}
@@ -81,7 +82,7 @@
     Set Runners
${path to datasource} = Set Variables And Get Datasources ${datasource}
     ${path to runner} =  Join Path  ${ROBOTPATH}  runner.py
- ProcessManager.start process ${INTERPRETER} ${path to runner} --variable TESTSIGNALFILE:${test signal file} --output ${OUTFILE} --report None --log None --debugfile %{HOME}/${TESTNAME}_${TEST TIMESTAMP}.txt --variable TEARDOWNSLEEP:${teardown sleep} ${path to datasource} + ProcessManager.start process ${INTERPRETER} ${path to runner} --variable TESTSIGNALFILE:${test signal file} --output ${OUTFILE} --report None --log None --debugfile ${TEMPDIR}/${TESTNAME}_${TEST TIMESTAMP}.txt --variable TEARDOWNSLEEP:${teardown sleep} ${path to datasource}

 Start Running Jybot
     [arguments]  ${test signal file}  ${datasource}  ${teardown sleep}
@@ -89,9 +90,9 @@
     Set Runners
${path to datasource} = Set Variables And Get Datasources ${datasource}
     ${path to runner} =  Join Path  ${ROBOTPATH}  runner.py
- ${command to run jython} = catenate ${jybot} ${path to runner} --variable TESTSIGNALFILE:${test signal file} --output ${OUTFILE} --report None --log None --debugfile %{HOME}/${TESTNAME}_${TEST TIMESTAMP}.txt --variable TEARDOWNSLEEP:${teardown sleep} ${path to datasource}
-    log  ${command to run jython}
- ProcessManager.start process ${jybot} ${path to runner} --variable TESTSIGNALFILE:${test signal file} --output ${OUTFILE} --report None --log None --debugfile %{HOME}/${TESTNAME}_${TEST TIMESTAMP}.txt --variable TEARDOWNSLEEP:${teardown sleep} ${path to datasource} + @{command} = Create List ${jybot} ${path to runner} --variable TESTSIGNALFILE:${test signal file} --output ${OUTFILE} --report None --log None --debugfile ${TEMPDIR}/${TESTNAME}_${TEST TIMESTAMP}.txt --variable TEARDOWNSLEEP:${teardown sleep} ${path to datasource}
+    Log Many  @{command}
+    ProcessManager.start process  @{command}

 Check Test Cases Have Failed Correctly
     Check Test Case  Test  FAIL  Execution terminated by signal
@@ -106,19 +107,19 @@
     Process Output  ${OUTFILE}

 One Signal
-       [arguments]  ${signal}
-       send terminate  ${signal}
+    [arguments]  ${signal}
+    send terminate  ${signal}

 Two Signals
-       [arguments]  ${signal}
-       send terminate  ${signal}
-       Busy Sleep  1
-       send terminate  ${signal}
+    [arguments]  ${signal}
+    send terminate  ${signal}
+    Busy Sleep  1
+    send terminate  ${signal}

 Log Info From Process And Cleanup
     Run Keyword If Test Failed  Log Stdout And Stderr
- Run Keyword If Test Passed Remove File %{HOME}/${TESTNAME}_${TEST TIMESTAMP}.txt
-
- Set timestamp
+ Run Keyword If Test Passed Remove File ${TEMPDIR}/${TESTNAME}_${TEST TIMESTAMP}.txt
+
+Set timestamp
     ${tmp} =  Get Time
     Set Suite Variable  ${TEST TIMESTAMP}  ${tmp}

Reply via email to