2 new revisions:
Revision: 5f276d37d2ce
Branch: default
Author: Mikko Korpela <[email protected]>
Date: Mon Nov 18 08:12:22 2013 UTC
Log: process: Move lot of output test to terminate_and_pid because of
the p...
http://code.google.com/p/robotframework/source/detail?r=5f276d37d2ce
Revision: 73f3f4f6f3b9
Branch: default
Author: Mikko Korpela <[email protected]>
Date: Mon Nov 18 08:12:43 2013 UTC
Log: merge
http://code.google.com/p/robotframework/source/detail?r=73f3f4f6f3b9
==============================================================================
Revision: 5f276d37d2ce
Branch: default
Author: Mikko Korpela <[email protected]>
Date: Mon Nov 18 08:12:22 2013 UTC
Log: process: Move lot of output test to terminate_and_pid because of
the preconditions
http://code.google.com/p/robotframework/source/detail?r=5f276d37d2ce
Modified:
/atest/robot/standard_libraries/process/process_library.txt
/atest/robot/standard_libraries/process/terminate_and_pid.txt
/atest/testdata/standard_libraries/process/process_library.txt
/atest/testdata/standard_libraries/process/terminate_and_pid.txt
=======================================
--- /atest/robot/standard_libraries/process/process_library.txt Thu Oct 31
15:10:46 2013 UTC
+++ /atest/robot/standard_libraries/process/process_library.txt Mon Nov 18
08:12:22 2013 UTC
@@ -72,6 +72,3 @@
Current working directory should not be used with stdout and stderr when
absolute path in use
Check Test Case ${TESTNAME}
-
-Lot of output
- Check Test Case ${TESTNAME}
=======================================
--- /atest/robot/standard_libraries/process/terminate_and_pid.txt Thu Oct
31 15:10:46 2013 UTC
+++ /atest/robot/standard_libraries/process/terminate_and_pid.txt Mon Nov
18 08:12:22 2013 UTC
@@ -42,6 +42,9 @@
Getting PIDs in different ways should give same result
Check Test Case ${TESTNAME}
+
+Lot of output
+ Check Test Case ${TESTNAME}
*** Keywords ***
Check Preconditions
=======================================
--- /atest/testdata/standard_libraries/process/process_library.txt Thu Oct
31 15:10:46 2013 UTC
+++ /atest/testdata/standard_libraries/process/process_library.txt Mon Nov
18 08:12:22 2013 UTC
@@ -157,13 +157,6 @@
[Teardown] Run Keywords
... Safe Remove Directory %{TEMPDIR}/hc AND
... Safe Remove File ${stdout_path}
-
-Lot of output
- [Tags] performance
- ${stdout}= Normalize Path %{TEMPDIR}/stdout.txt
- ${handle}= Run Process python -c "for i in range(350000):
\tprint 'a'*400" shell=True stdout=${stdout} stderr=STDOUT
- File Should Not Be Empty ${stdout}
- [Teardown] Safe Remove File ${stdout}
*** Keywords ***
Restart Suite Process If Needed
=======================================
--- /atest/testdata/standard_libraries/process/terminate_and_pid.txt Thu
Oct 31 15:10:46 2013 UTC
+++ /atest/testdata/standard_libraries/process/terminate_and_pid.txt Mon
Nov 18 08:12:22 2013 UTC
@@ -1,6 +1,7 @@
*** Settings ***
Suite Setup Check Precondition sys.version_info >= (2,6)
Test Teardown Terminate All Processes kill=True
+Library Collections
Resource resource.txt
Test Timeout 15s
@@ -97,3 +98,10 @@
${pid3}= Get Process Id ${handle}
Should Be Equal As Integers ${pid1} ${pid2}
Should Be Equal As Integers ${pid1} ${pid3}
+
+Lot of output
+ [Tags] performance
+ ${stdout}= Normalize Path %{TEMPDIR}/stdout.txt
+ ${handle}= Run Process python -c "for i in range(350000):
\tprint 'a'*400" shell=True stdout=${stdout} stderr=STDOUT
+ File Should Not Be Empty ${stdout}
+ [Teardown] Safe Remove File ${stdout}
==============================================================================
Revision: 73f3f4f6f3b9
Branch: default
Author: Mikko Korpela <[email protected]>
Date: Mon Nov 18 08:12:43 2013 UTC
Log: merge
http://code.google.com/p/robotframework/source/detail?r=73f3f4f6f3b9
Modified:
/atest/testdata/standard_libraries/process/process_library.txt
/atest/testdata/standard_libraries/process/terminate_and_pid.txt
=======================================
--- /atest/testdata/standard_libraries/process/process_library.txt Mon Nov
18 08:12:22 2013 UTC
+++ /atest/testdata/standard_libraries/process/process_library.txt Mon Nov
18 08:12:43 2013 UTC
@@ -97,7 +97,12 @@
Running a process in a shell
${result}= Run Process python -c "print 'hello'" shell=True
Result should equal ${result} stdout=hello
+ ${result}= Run Process python -c "print 'hello'" shell=0
+ Result should equal ${result} stdout=hello
Run Keyword And Expect Error * Run Process python
-c "print 'hello'" shell=${False}
+ Run Keyword And Expect Error * Run Process python
-c "print 'hello'" shell=${0}
+ Run Keyword And Expect Error * Run Process python
-c "print 'hello'" shell=False
+ Run Keyword And Expect Error * Run Process python
-c "print 'hello'" shell=false
Input things to process
Start Process python -c "print 'inp %s' % raw_input()" shell=True
=======================================
--- /atest/testdata/standard_libraries/process/terminate_and_pid.txt Mon
Nov 18 08:12:22 2013 UTC
+++ /atest/testdata/standard_libraries/process/terminate_and_pid.txt Mon
Nov 18 08:12:43 2013 UTC
@@ -39,7 +39,7 @@
${process} = Start Process python ${NONTERM}
Process Should Be Running ${process}
Sleep 0.1
- ${result} = Terminate Process ${process}
+ ${result} = Terminate Process ${process} kill=false
Wait For Process ${process}
Process Should Be Stopped ${process}
Should Not Be Equal As Integers ${result.rc} 0
--
---
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.
