2 new revisions:

Revision: 49bd4620c298
Branch:   default
Author:   Mikko Korpela <[email protected]>
Date:     Fri May 31 03:29:23 2013
Log: Process: Jython windows tests have issues with file/directory removal ...
http://code.google.com/p/robotframework/source/detail?r=49bd4620c298

Revision: 3e8541c114fd
Branch:   default
Author:   Mikko Korpela <[email protected]>
Date:     Fri May 31 03:29:51 2013
Log:      Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=3e8541c114fd

==============================================================================
Revision: 49bd4620c298
Branch:   default
Author:   Mikko Korpela <[email protected]>
Date:     Fri May 31 03:29:23 2013
Log: Process: Jython windows tests have issues with file/directory removal ignoring them
http://code.google.com/p/robotframework/source/detail?r=49bd4620c298

Modified:
 /atest/testdata/standard_libraries/process/test_process_library.txt

=======================================
--- /atest/testdata/standard_libraries/process/test_process_library.txt Tue May 28 02:29:58 2013 +++ /atest/testdata/standard_libraries/process/test_process_library.txt Fri May 31 03:29:23 2013
@@ -47,14 +47,14 @@
     ${output}=    Get File    ${TEMPDIR}${/}myfile_1.txt
     Should Not Be Empty    ${output}
     Should Be Equal    ${result.stdout}    ${output}
-    #[Teardown]    Remove File    ${TEMPDIR}${/}myfile_1.txt
+ [Teardown] Run Keyword And Ignore Error Remove File ${TEMPDIR}${/}myfile_1.txt

 Setting Stderr
${result}= Run Process python -c "1/0" shell=True stderr=${TEMPDIR}${/}myfile.txt
     ${output}=    Get File    ${TEMPDIR}${/}myfile.txt
     Should Not Be Empty    ${output}
     Should Be Equal    ${result.stderr}    ${output}
-    [Teardown]    Remove File    ${TEMPDIR}${/}myfile.txt
+ [Teardown] Run Keyword And Ignore Error Remove File ${TEMPDIR}${/}myfile.txt

 Without Env Configuration the Environment Should Be As It Was
     Set Environment Variable  normalvar  normal
@@ -121,7 +121,7 @@
     Should Match    ${result.stdout}    *hello*
     Should Match    ${result.stdout}    *ZeroDivisionError*
     Log    ${result.stderr}
-    [Teardown]    Remove File    filename.txt
+ [Teardown] Run Keyword And Ignore Error Remove File filename.txt

 Current working directory should be used with stdout and stderr
     Create Directory    ${TEMPDIR}${/}hc
@@ -131,7 +131,7 @@
     ${output2}=    Get File    ${TEMPDIR}${/}hc${/}myerr.txt
     Should Match    ${output}    *moon kuu*
     Should Match    ${output2}    *ZeroDivisionError*
-    [Teardown]    Remove Directory    ${TEMPDIR}${/}hc    True
+ [Teardown] Run Keyword And Ignore Error Remove Directory ${TEMPDIR}${/}hc True

Current working directory should not be used with stdout and stderr when absolute path in use
     Create Directory    ${TEMPDIR}${/}hc
@@ -143,7 +143,7 @@
     Should Match    ${output}    *moon kuu*
     Should Match    ${output2}    *ZeroDivisionError*
     Remove File    ${stdout_path}
-    [Teardown]    Remove Directory    ${TEMPDIR}${/}hc    True
+ [Teardown] Run Keyword And Ignore Error Remove Directory ${TEMPDIR}${/}hc True


 *** Keywords ***

==============================================================================
Revision: 3e8541c114fd
Branch:   default
Author:   Mikko Korpela <[email protected]>
Date:     Fri May 31 03:29:51 2013
Log:      Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=3e8541c114fd


--

--- 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