[robotframework] r3648 committed - cleanup

[robotframework]

Revision: 3648
Author: jussi.ao.malinen
Date: Fri May 28 08:06:29 2010
Log: cleanup
http://code.google.com/p/robotframework/source/detail?r=3648
Modified:
 /trunk/atest/robot/running/stopping_with_signal.txt

=======================================
--- /trunk/atest/robot/running/stopping_with_signal.txt	Fri May 28 07:46:43  
2010
+++ /trunk/atest/robot/running/stopping_with_signal.txt	Fri May 28 08:06:29  
2010
@@ -3,7 +3,8 @@
 Resource        atest_resource.txt
 Library         ProcessManager.py
 Test Teardown   Log Info From Process And Cleanup
-Suite Setup     Set timestamp
+Suite Setup     Set Timestamp
+Test Setup      Set Test Debug File


 *** Test Cases ***
@@ -79,18 +80,19 @@

 Start Running Robot
     [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}   
--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 Run  ${INTERPRETER}  ${test signal file}  ${datasource}   
${teardown sleep}

 Start Running Jybot
     [arguments]  ${test signal file}  ${datasource}  ${teardown sleep}
     ${jybot} =  Get Jython Path
+    Start Run  ${jybot}  ${test signal file}  ${datasource}  ${teardown  
sleep}
+
+Start Run
+    [arguments]  ${runner}  ${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
-    @{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}
+    @{command} =  Create List  ${runner}  ${path to runner}  --variable   
TESTSIGNALFILE:${test signal file}  --output  ${OUTFILE}  --report  None   
--log  None  --debugfile  ${TEST DEBUG FILE}  --variable   
TEARDOWNSLEEP:${teardown sleep}  ${path to datasource}
     Log Many  @{command}
     ProcessManager.start process  @{command}

@@ -115,11 +117,14 @@
     send terminate  ${signal}
     Busy Sleep  1
     send terminate  ${signal}
+
+Set Timestamp
+    ${tmp time} =  Get Time
+    Set Suite Variable  ${TEST TIMESTAMP}  ${tmp time}
+
+Set Test Debug File
+    Set Test Variable  ${TEST DEBUG FILE}  ${TEMPDIR}/${TESTNAME}_${TEST  
TIMESTAMP}.txt

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