2 new revisions:
Revision: 47623e5772d2
Branch: default
Author: Anssi Syrjäsalo
Date: Wed May 29 06:16:18 2013
Log: Updated tests to use dedicated command line options instead of
using r...
http://code.google.com/p/robotframework/source/detail?r=47623e5772d2
Revision: 38c334066a6d
Branch: default
Author: Anssi Syrjäsalo
Date: Wed May 29 06:16:29 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=38c334066a6d
==============================================================================
Revision: 47623e5772d2
Branch: default
Author: Anssi Syrjäsalo
Date: Wed May 29 06:16:18 2013
Log: Updated tests to use dedicated command line options instead of
using runmode
Update issue 1445
Updated tests to use --exitonfailure and --skipteardownonexit command line
options instead of the old --runmode option values.
TODO: Create a single suite for all the deprecated --runmode tests.
http://code.google.com/p/robotframework/source/detail?r=47623e5772d2
Modified:
/atest/robot/cli/dryrun/run_keyword_variants.txt
/atest/robot/cli/dryrun/run_keyword_variants_in_suite_teardown.txt
/atest/robot/cli/runner/exit_on_failure.txt
/atest/robot/running/fatal_exception.txt
/atest/robot/running/stopping_with_signal.txt
=======================================
--- /atest/robot/cli/dryrun/run_keyword_variants.txt Tue Jan 1 16:02:25
2013
+++ /atest/robot/cli/dryrun/run_keyword_variants.txt Wed May 29 06:16:18
2013
@@ -1,5 +1,5 @@
*** Settings ***
-Suite Setup Run Tests --runmode dryrun
cli/dryrun/run_keyword_variants.txt
+Suite Setup Run Tests --dryrun cli/dryrun/run_keyword_variants.txt
Force Tags regression pybot jybot
Resource atest_resource.txt
=======================================
--- /atest/robot/cli/dryrun/run_keyword_variants_in_suite_teardown.txt Fri
Aug 20 05:59:35 2010
+++ /atest/robot/cli/dryrun/run_keyword_variants_in_suite_teardown.txt Wed
May 29 06:16:18 2013
@@ -1,5 +1,5 @@
*** Settings ***
-Suite Setup Run Tests --runmode dryrun
cli/dryrun/run_keyword_variants_in_suite_teardown.txt
+Suite Setup Run Tests --dryrun
cli/dryrun/run_keyword_variants_in_suite_teardown.txt
Force Tags regression pybot jybot
Resource atest_resource.txt
=======================================
--- /atest/robot/cli/runner/exit_on_failure.txt Mon Jun 18 00:57:01 2012
+++ /atest/robot/cli/runner/exit_on_failure.txt Wed May 29 06:16:18 2013
@@ -4,7 +4,7 @@
*** Test Cases ***
Exit On Failure
- [Setup] Run Tests --runmode exitonfailure misc/pass_and_fail.txt
misc/suites running/fatal_exception/02__irrelevant.txt
+ [Setup] Run Tests --exitonfailure misc/pass_and_fail.txt
misc/suites running/fatal_exception/02__irrelevant.txt
Check Test Case Pass
Check Test Case Fail
Check Test Case SubSuite1 First FAIL Critical failure occurred and
ExitOnFailure option is in use
@@ -15,7 +15,7 @@
Should be empty ${ERRORS.messages}
Correct Suite Teardown Is Executed When Exitonfailure Is Used
- [Setup] Run Tests --runmode exitonfailure misc/suites
+ [Setup] Run Tests --exitonfailure misc/suites
${tsuite} = Get Test Suite Suites
Should Be Equal ${tsuite.teardown.name} BuiltIn.Log
${tsuite} = Get Test Suite Fourth
@@ -24,7 +24,7 @@
Should Be Equal ${tsuite.teardown} ${None}
Exit On Failure With Skip Teardown On Exit
- [Setup] Run Tests --runmode ExitOnFailure --runmode
SkipTeardownOnExit misc/suites
+ [Setup] Run Tests --ExitOnFailure --SkipTeardownOnExit misc/suites
${tcase} = Check Test Case Suite4 First
Should Be Equal ${tcase.teardown} ${None}
${tsuite} = Get Test Suite Fourth
=======================================
--- /atest/robot/running/fatal_exception.txt Wed Feb 2 02:42:09 2011
+++ /atest/robot/running/fatal_exception.txt Wed May 29 06:16:18 2013
@@ -38,7 +38,7 @@
Should Be Equal ${ts2.teardown} ${None}
Multiple Suite Aware Exiting From Suite Setup With Skip Teardowns
- Run Tests --runmode SkipTeardownOnExit
running/fatal_exception_suite_setup/
+ Run Tests --SkipTeardownOnExit running/fatal_exception_suite_setup/
Check Test Case Test That Should Not Be Run 1
${ts1} = Get Test Suite Suite Setup
Should Be Equal ${ts1.teardown} ${None}
@@ -48,12 +48,12 @@
Should Be Equal ${ts2.teardown} ${None}
Fatal Exception and Runmode Exit on Failure
- Run Tests --runmode exitonfailure
running/fatal_exception/01__python_library_kw.txt
+ Run Tests --exitonfailure
running/fatal_exception/01__python_library_kw.txt
Check Test Case Test That Should Not Be Run 1 FAIL
... Critical failure occurred and ExitOnFailure option is in use
Fatal Exception and Runmodes Exit On Failure And Skip Teardown On Exit
- Run Tests --runmode SkipTeardownOnExit running/fatal_exception
+ Run Tests --SkipTeardownOnExit running/fatal_exception
${tcase} = Check Test Case Exit From Python Keyword
Should Be Equal ${tcase.teardown} ${None}
${tsuite} Get Test Suite Python Library Kw
=======================================
--- /atest/robot/running/stopping_with_signal.txt Thu Sep 20 14:00:45 2012
+++ /atest/robot/running/stopping_with_signal.txt Wed May 29 06:16:18 2013
@@ -73,7 +73,7 @@
Check Log Message ${ts.teardown.kws[0].msgs[0]} Logging Suite
Teardown
One Signal Should Stop Test Execution Gracefully And Skip Teardowns With
Runmode
- Start And Send Signal with_teardown.txt One SIGINT
runmode=SkipTeardownOnExit
+ Start And Send Signal with_teardown.txt One SIGINT
runmode=--SkipTeardownOnExit
Process Output For Graceful Shutdown
Check Test Cases Have Failed Correctly
${tc} = Get Test Case Test
@@ -84,7 +84,7 @@
*** Keywords ***
Start And Send Signal
- [Arguments] ${datasource} ${signals} ${sleep}=0s
${runmode}=normal
+ [Arguments] ${datasource} ${signals} ${sleep}=0s
${runmode}=${EMPTY}
Remove File ${TEST FILE}
Start Run ${datasource} ${sleep} ${runmode}
Wait Until Created ${TESTFILE} timeout=45s
@@ -101,7 +101,7 @@
... --output ${OUTFILE} --report NONE --log NONE
... --variable TESTSIGNALFILE:${TEST FILE}
... --variable TEARDOWNSLEEP:${sleep}
- ... --runmode ${runmode}
+ ... ${runmode}
... ${datasource}
Log Many @{command}
ProcessManager.start process @{command}
==============================================================================
Revision: 38c334066a6d
Branch: default
Author: Anssi Syrjäsalo
Date: Wed May 29 06:16:29 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=38c334066a6d
--
---
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.
