Revision: 18e48a5ac77c
Branch:   default
Author:   Mikko Korpela <[email protected]>
Date:     Mon May  6 03:17:09 2013
Log:      Process tests: isolate jython / python2.5 failing tests
http://code.google.com/p/robotframework/source/detail?r=18e48a5ac77c

Added:
 /atest/robot/standard_libraries/process/terminate_and_pid.txt
 /atest/testdata/standard_libraries/process/terminate_and_pid.txt
Modified:
 /atest/robot/standard_libraries/process/test_process_library.txt
 /atest/testdata/standard_libraries/process/test_process_library.txt

=======================================
--- /dev/null
+++ /atest/robot/standard_libraries/process/terminate_and_pid.txt Mon May 6 03:17:09 2013
@@ -0,0 +1,31 @@
+*** Settings ***
+Suite Setup Run Tests ${EMPTY} standard_libraries/process/terminate_and_pid.txt
+Test Setup       Check Preconditions
+Force Tags       regression    pybot    jybot
+Resource         atest_resource.txt
+
+*** Test Cases ***
+Run process does not change active process
+    Check Test Case    ${TESTNAME}
+
+Killing process
+    Check Test Case    ${TESTNAME}
+
+Terminating process
+    Check Test Case    ${TESTNAME}
+
+Pid
+    Check Test Case    ${TESTNAME}
+
+Starting many processes and killing all
+    Check Test Case    ${TESTNAME}
+
+Kill Process Which Does Not Exist
+    Check Test Case    ${TESTNAME}
+
+Wait For Process Which Does Not Exist
+    Check Test Case    ${TESTNAME}
+
+*** Keywords ***
+Check Preconditions
+ Run Keyword If '${SUITE.metadata.get('info')}' == 'precondition_fail' Fail precondition fail -regression
=======================================
--- /dev/null
+++ /atest/testdata/standard_libraries/process/terminate_and_pid.txt Mon May 6 03:17:09 2013
@@ -0,0 +1,72 @@
+*** Settings ***
+Suite Setup       Check Preconditions
+Library           Process.py
+Library           OperatingSystem
+Resource          resource.txt
+
+*** Test Cases ***
+Run process does not change active process
+    Some process    active
+    ${expected id}=    Get Process Id
+    Run Python Process    1+1
+    ${id}=    Get Process Id
+    Should Be Equal    ${expected id}    ${id}
+
+Killing process
+    ${handle}=    Some process
+    ${is_alive}=    Process Is Running    ${handle}
+    Should Be True    ${is_alive}
+    Terminate Process    ${handle}    kill=${True}
+    Wait For Process    ${handle}
+    Process Should Be Stopped    ${handle}
+
+Terminating process
+    ${handle}=    Some process
+    Terminate Process    ${handle}
+    Wait For Process    ${handle}
+    Process Should Be Stopped    ${handle}
+
+Pid
+    ${handle}=    Some process
+    ${pid}=    Get Process Id    ${handle}
+    Should Not Be Equal   ${pid}   ${None}
+    Evaluate    os.kill(int(${pid}),signal.SIGTERM)    os,signal
+    Wait For Process    ${handle}
+    Process Should Be Stopped    ${handle}
+
+Starting many processes and killing all
+    ${handle1}=    Some process
+    ${handle2}=    Some process
+    ${handle3}=    Some process
+    ${handle4}=    Some process
+    ${handle5}=    Some process
+    Sleep    0.1
+    Process Should Be Running    ${handle1}
+    Process Should Be Running    ${handle2}
+    Process Should Be Running    ${handle3}
+    Process Should Be Running    ${handle4}
+    Process Should Be Running    ${handle5}
+    Terminate All Processes
+    Sleep    0.1
+    Process Should Be Stopped    ${handle1}
+    Process Should Be Stopped    ${handle2}
+    Process Should Be Stopped    ${handle3}
+    Process Should Be Stopped    ${handle4}
+    Process Should Be Stopped    ${handle5}
+
+Kill Process Which Does Not Exist
+    ${handle}=    Some process
+    Terminate Process    ${handle}    kill=${True}
+    Terminate Process    ${handle}    kill=${True}
+
+Wait For Process Which Does Not Exist
+    ${handle}=    Some process
+    Terminate Process    ${handle}    kill=${True}
+    Wait For Process    ${handle}
+
+*** Keywords ***
+Check Preconditions
+    ${is_ok}=   Evaluate   sys.version_info >= (2,6)   sys
+ Run Keyword If not ${is_ok} Set Suite Metadata info precondition_fail
+    Run Keyword If  not ${is_ok}    Fail
+
=======================================
--- /atest/robot/standard_libraries/process/test_process_library.txt Mon May 6 01:24:35 2013 +++ /atest/robot/standard_libraries/process/test_process_library.txt Mon May 6 03:17:09 2013
@@ -1,6 +1,5 @@
 *** Settings ***
Suite Setup Run Tests ${EMPTY} standard_libraries/process/test_process_library.txt
-Test Setup       Check Preconditions
 Force Tags       regression    pybot    jybot
 Resource         atest_resource.txt

@@ -19,27 +18,6 @@

 Switching active process
     Check Test Case    ${TESTNAME}
-
-Run process does not change active process
-    Check Test Case    ${TESTNAME}
-
-Killing process
-    Check Test Case    ${TESTNAME}
-
-Terminating process
-    Check Test Case    ${TESTNAME}
-
-Pid
-    Check Test Case    ${TESTNAME}
-
-Starting many processes and killing all
-    Check Test Case    ${TESTNAME}
-
-Kill Process Which Does Not Exist
-    Check Test Case    ${TESTNAME}
-
-Wait For Process Which Does Not Exist
-    Check Test Case    ${TESTNAME}

 Change Current Working Directory
     Check Test Case    ${TESTNAME}
@@ -76,7 +54,3 @@

Current working directory should not be used with stdout and stderr when absolute path in use
     Check Test Case    ${TESTNAME}
-
-*** Keywords ***
-Check Preconditions
- Run Keyword If '${SUITE.metadata.get('info')}' == 'precondition_fail' Fail precondition fail -regression
=======================================
--- /atest/testdata/standard_libraries/process/test_process_library.txt Mon May 6 00:29:42 2013 +++ /atest/testdata/standard_libraries/process/test_process_library.txt Mon May 6 03:17:09 2013
@@ -1,5 +1,5 @@
 *** Settings ***
-Suite Setup       Check Preconditions And Start suite_process
+Suite Setup       Some process    suite_process
 Suite Teardown    Stop some process    suite_process
 Test Teardown     Restart Suite Process If Needed
 Library           Process.py
@@ -35,65 +35,6 @@
     Switch Active Process    two
     Process Should Be Running
     Stop Some Process
-
-Run process does not change active process
-    Some process    active
-    ${expected id}=    Get Process Id
-    Run Python Process    1+1
-    ${id}=    Get Process Id
-    Should Be Equal    ${expected id}    ${id}
-
-Killing process
-    ${handle}=    Some process
-    ${is_alive}=    Process Is Running    ${handle}
-    Should Be True    ${is_alive}
-    Terminate Process    ${handle}    kill=${True}
-    Wait For Process    ${handle}
-    Process Should Be Stopped    ${handle}
-
-Terminating process
-    ${handle}=    Some process
-    Terminate Process    ${handle}
-    Wait For Process    ${handle}
-    Process Should Be Stopped    ${handle}
-
-Pid
-    ${handle}=    Some process
-    ${pid}=    Get Process Id    ${handle}
-    Should Not Be Equal   ${pid}   ${None}
-    Evaluate    os.kill(int(${pid}),signal.SIGTERM)    os,signal
-    Wait For Process    ${handle}
-    Process Should Be Stopped    ${handle}
-
-Starting many processes and killing all
-    ${handle1}=    Some process
-    ${handle2}=    Some process
-    ${handle3}=    Some process
-    ${handle4}=    Some process
-    ${handle5}=    Some process
-    Sleep    0.1
-    Process Should Be Running    ${handle1}
-    Process Should Be Running    ${handle2}
-    Process Should Be Running    ${handle3}
-    Process Should Be Running    ${handle4}
-    Process Should Be Running    ${handle5}
-    Terminate All Processes
-    Sleep    0.1
-    Process Should Be Stopped    ${handle1}
-    Process Should Be Stopped    ${handle2}
-    Process Should Be Stopped    ${handle3}
-    Process Should Be Stopped    ${handle4}
-    Process Should Be Stopped    ${handle5}
-
-Kill Process Which Does Not Exist
-    ${handle}=    Some process
-    Terminate Process    ${handle}    kill=${True}
-    Terminate Process    ${handle}    kill=${True}
-
-Wait For Process Which Does Not Exist
-    ${handle}=    Some process
-    Terminate Process    ${handle}    kill=${True}
-    Wait For Process    ${handle}

 Change Current Working Directory
${result}= Run Process python -c import os; print os.path.abspath(os.curdir); cwd=.
@@ -182,12 +123,3 @@
 Restart Suite Process If Needed
     ${alive}=    Process Is Running    suite_process
     Run Keyword If    not ${alive}    Some process    suite_process
-
-Check Preconditions
-    ${is_ok}=   Evaluate   sys.version_info >= (2,6)   sys
- Run Keyword If not ${is_ok} Set Suite Metadata info precondition_fail
-    Run Keyword If  not ${is_ok}    Fail
-
-Check Preconditions And Start suite_process
-    Some process    suite_process
-    Check Preconditions

--

--- You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.


Reply via email to