Revision: 3235
Author: jussi.ao.malinen
Date: Fri May 7 04:39:12 2010
Log: stopping with signals tests now uses better file names
http://code.google.com/p/robotframework/source/detail?r=3235
Modified:
/trunk/atest/robot/running/stopping_with_signal.txt
/trunk/atest/testdata/running/stopping_with_signal/keyword_timeout.txt
/trunk/atest/testdata/running/stopping_with_signal/run_keyword.txt
/trunk/atest/testdata/running/stopping_with_signal/test_timeout.txt
/trunk/atest/testdata/running/stopping_with_signal/with_teardown.txt
/trunk/atest/testdata/running/stopping_with_signal/without_any_timeout.txt
=======================================
--- /trunk/atest/robot/running/stopping_with_signal.txt Wed May 5 03:33:00
2010
+++ /trunk/atest/robot/running/stopping_with_signal.txt Fri May 7 04:39:12
2010
@@ -63,28 +63,29 @@
*** Key Words ***
Start And Send Signal
[arguments] ${testcase file} ${signal method} ${signal} ${teardown
sleep}
- Remove File ${TEMPDIR}/robot_signal_test_started.txt
${is_jython_in_use} = Running On Jython ${INTERPRETER}
- Run Keyword unless ${is_jython_in_use} Start Running Robot
running/stopping_with_signal/${testcase file} ${teardown sleep}
- Run Keyword if ${is_jython_in_use} Start Running jybot
running/stopping_with_signal/${testcase file} ${teardown sleep}
- Wait Until Created ${TEMPDIR}/robot_signal_test_started.txt
+ ${test signal file} = catenate SEPARATOR=_
robot_signal_test_started %{USER} ${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}
+ Wait Until Created ${TEMPDIR}/${test signal file} 5 minutes
Run Keyword ${signal method} ${signal}
wait until finished
Start Running Robot
- [arguments] ${datasource} ${teardown sleep}
+ [arguments] ${test signal file} ${datasource} ${teardown sleep}
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}
--output ${OUTFILE} --report None --log None --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 --variable TEARDOWNSLEEP:${teardown sleep}
${path to datasource}
Start Running Jybot
- [arguments] ${datasource} ${teardown sleep}
+ [arguments] ${test signal file} ${datasource} ${teardown sleep}
${jybot} = Get Jython Path
Set Runners
${path to datasource} = Set Variables And Get Datasources
${datasource}
${path to runner} = Join Path ${ROBOTPATH} runner.py
- ProcessManager.start process ${jybot} ${path to runner} --output
${OUTFILE} --report None --log None --variable
TEARDOWNSLEEP:${teardown sleep} ${path to datasource}
+ ProcessManager.start process ${jybot} ${path to runner} --variable
TESTSIGNALFILE:${test signal file} --output ${OUTFILE} --report None
--log None --variable TEARDOWNSLEEP:${teardown sleep} ${path to
datasource}
Check Test Cases Have Failed Correctly
Check Test Case Test FAIL Execution terminated by signal
=======================================
--- /trunk/atest/testdata/running/stopping_with_signal/keyword_timeout.txt
Mon May 3 07:19:13 2010
+++ /trunk/atest/testdata/running/stopping_with_signal/keyword_timeout.txt
Fri May 7 04:39:12 2010
@@ -5,10 +5,11 @@
*** Variables ***
${TEARDOWN SLEEP} = 0 seconds
+${TESTSIGNALFILE} = test_signal_file.txt
*** Test Case ***
Test
- Create File ${TEMPDIR}/robot_signal_test_started.txt
+ Create File ${TEMPDIR}/${TESTSIGNALFILE}
Timeout In UK
No operation
=======================================
--- /trunk/atest/testdata/running/stopping_with_signal/run_keyword.txt Mon
May 3 07:16:06 2010
+++ /trunk/atest/testdata/running/stopping_with_signal/run_keyword.txt Fri
May 7 04:39:12 2010
@@ -5,10 +5,11 @@
*** Variables ***
${TEARDOWN SLEEP} = 0 seconds
+${TESTSIGNALFILE} = test_signal_file.txt
*** Test Case ***
Test
- Create File ${TEMPDIR}/robot_signal_test_started.txt
+ Create File ${TEMPDIR}/${TESTSIGNALFILE}
Run Keyword Busy Sleep 2
No Operation
=======================================
--- /trunk/atest/testdata/running/stopping_with_signal/test_timeout.txt Mon
May 3 07:19:13 2010
+++ /trunk/atest/testdata/running/stopping_with_signal/test_timeout.txt Fri
May 7 04:39:12 2010
@@ -5,10 +5,11 @@
*** Variables ***
${TEARDOWN SLEEP} = 0 seconds
+${TESTSIGNALFILE} = test_signal_file.txt
*** Test Case ***
Test [timeout] 3 Seconds
- Create File ${TEMPDIR}/robot_signal_test_started.txt
+ Create File ${TEMPDIR}/${TESTSIGNALFILE}
Busy Sleep 2
No Operation
=======================================
--- /trunk/atest/testdata/running/stopping_with_signal/with_teardown.txt
Thu May 6 03:01:28 2010
+++ /trunk/atest/testdata/running/stopping_with_signal/with_teardown.txt
Fri May 7 04:39:12 2010
@@ -5,10 +5,11 @@
*** Variables ***
${TEARDOWN SLEEP} = 0 seconds
+${TESTSIGNALFILE} = test_signal_file.txt
*** Test Case ***
Test
- Create File ${TEMPDIR}/robot_signal_test_started.txt
+ Create File ${TEMPDIR}/${TESTSIGNALFILE}
Busy Sleep 2
No Operation
[teardown] Log Logging Test Case Teardown
=======================================
---
/trunk/atest/testdata/running/stopping_with_signal/without_any_timeout.txt
Mon May 3 07:16:06 2010
+++
/trunk/atest/testdata/running/stopping_with_signal/without_any_timeout.txt
Fri May 7 04:39:12 2010
@@ -5,10 +5,11 @@
*** Variables ***
${TEARDOWN SLEEP} = 0 seconds
+${TESTSIGNALFILE} = test_signal_file.txt
*** Test Case ***
Test
- Create File ${TEMPDIR}/robot_signal_test_started.txt
+ Create File ${TEMPDIR}/${TESTSIGNALFILE}
Busy Sleep 2
No Operation
