2 new revisions:

Revision: 830ad2effd3e
Branch:   default
Author:   Anssi Syrjäsalo
Date:     Wed May 29 06:51:24 2013
Log:      Deprecated --runmode tests into one suite...
http://code.google.com/p/robotframework/source/detail?r=830ad2effd3e

Revision: 7c4808a7bf29
Branch:   default
Author:   Anssi Syrjäsalo
Date:     Wed May 29 06:51:36 2013
Log:      Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=7c4808a7bf29

==============================================================================
Revision: 830ad2effd3e
Branch:   default
Author:   Anssi Syrjäsalo
Date:     Wed May 29 06:51:24 2013
Log:      Deprecated --runmode tests into one suite

Update issue 1445

All the tests using the old --runmode command line option arre now in deprecated_runmode suite, in atest/robot/running.
http://code.google.com/p/robotframework/source/detail?r=830ad2effd3e

Added:
 /atest/robot/running/deprecated_runmode/dryrun.txt
 /atest/robot/running/deprecated_runmode/exit_on_failure.txt
 /atest/robot/running/deprecated_runmode/fatal_exception.txt
 /atest/robot/running/deprecated_runmode/random_order.txt
 /atest/robot/running/deprecated_runmode/stopping_with_signal.txt
Deleted:
 /atest/robot/cli/dryrun/deprecated_dryrun.txt
 /atest/robot/cli/runner/random_order_deprecated.txt

=======================================
--- /dev/null
+++ /atest/robot/running/deprecated_runmode/dryrun.txt Wed May 29 06:51:24 2013
@@ -0,0 +1,114 @@
+*** Settings ***
+Suite Setup Run Tests --runmode dryrun cli/dryrun/dryrun.txt cli/dryrun/more_tests.txt
+Force Tags      regression  pybot  jybot
+Resource        atest_resource.txt
+
+*** Test Cases ***
+
+Passing keywords
+    ${tc}=  Check Test Case  ${TESTNAME}
+    Should have correct number of keywords  ${tc}  3
+    Name and status should be  ${tc.kws[0]}  BuiltIn.Log  NOT_RUN
+ Name and status should be ${tc.kws[1]} \${contents} = OperatingSystem.List Directory NOT_RUN
+    Name and status should be  ${tc.kws[2]}  resource.Simple UK  PASS
+    Name and status should be  ${tc.kws[2].kws[0]}  BuiltIn.Log  NOT_RUN
+
+Keywords with embedded arguments
+    ${tc}=  Check Test Case  ${TESTNAME}
+    Should have correct number of keywords  ${tc}  2
+    Name and status should be  ${tc.kws[0]}  Embedded arguments here  PASS
+ Name and status should be ${tc.kws[0].kws[0]} BuiltIn.No Operation NOT_RUN
+    Name and status should be  ${tc.kws[1]}  Embedded args rock here  PASS
+ Name and status should be ${tc.kws[1].kws[0]} BuiltIn.No Operation NOT_RUN
+
+Keywords that would fail
+    ${tc}=  Check Test Case  ${TESTNAME}
+    Should have correct number of keywords  ${tc}  3
+    Name and status should be  ${tc.kws[0]}  BuiltIn.Fail  NOT_RUN
+    Name and status should be  ${tc.kws[1]}  resource.Fail In UK  PASS
+    Should have correct number of keywords  ${tc.kws[1]}  2
+    Name and status should be  ${tc.kws[1].kws[0]}  BuiltIn.Fail  NOT_RUN
+    Name and status should be  ${tc.kws[1].kws[1]}  BuiltIn.Fail  NOT_RUN
+
+Scalar variables are not checked in keyword arguments
+ [Documentation] Variables are too often set somehow dynamically that we cannot expect them to always exist.
+    ${tc}=  Check Test Case  ${TESTNAME}
+    Name and status should be  ${tc.kws[0]}  BuiltIn.Log  NOT_RUN
+    Name and status should be  ${tc.kws[1]}  BuiltIn.Log  NOT_RUN
+
+List variables are not checked in keyword arguments
+    [Documentation]  See the doc of the previous test
+    Check Test Case  ${TESTNAME}
+
+Variables are not checked in when arguments are embedded
+    [Documentation]  See the doc of the previous test
+    ${tc}=  Check Test Case  ${TESTNAME}
+ Name and status should be ${tc.kws[0]} Embedded \${TESTNAME} here PASS + Name and status should be ${tc.kws[0].kws[0]} BuiltIn.No Operation NOT_RUN
+    Name and status should be  ${tc.kws[1]}  Embedded \${nonex} here  PASS
+ Name and status should be ${tc.kws[1].kws[0]} BuiltIn.No Operation NOT_RUN
+
+User keyword return value
+    Check Test Case  ${TESTNAME}
+
+Test Setup and Teardown
+    ${tc}=  Check Test Case  ${TESTNAME}
+    Should have correct number of keywords  ${tc}  1
+    Should Be Equal  ${tc.setup.name}  BuiltIn.Log
+    Should Be Equal  ${tc.teardown.name}  Does not exist
+
+Keyword Teardown
+    ${tc}=  Check Test Case  ${TESTNAME}
+    Should have correct number of keywords  ${tc}  1
+    Should Be Equal  ${tc.kws[0].kws[1].name}  Does not exist
+
+For Loops
+    ${tc}=  Check Test Case  ${TESTNAME}
+    Should have correct number of keywords  ${tc}  3
+    Should have correct number of keywords  ${tc.kws[0]}  1
+    Should have correct number of keywords  ${tc.kws[0].kws[0]}  2
+    Should have correct number of keywords  ${tc.kws[1]}  3
+    Should have correct number of keywords  ${tc.kws[1].kws[1]}  1
+
+Non-existing keyword name
+    Check Test Case  ${TESTNAME}
+
+Too few arguments
+    Check Test Case  ${TESTNAME}
+
+Too few arguments for UK
+    Check Test Case  ${TESTNAME}
+
+Too many arguments
+    Check Test Case  ${TESTNAME}
+
+Invalid syntax in UK
+    Check Test Case  ${TESTNAME}
+ Check Log Message ${ERRORS[0]} Creating user keyword 'Invalid Syntax UK' failed: Invalid argument '${arg'. ERROR
+
+Multiple Failures
+    Check Test Case  ${TESTNAME}
+
+Invalid imports
+ Check Stderr Contains Importing test library 'DoesNotExist' failed: ImportError: No module named DoesNotExist
+    Check Stderr Contains  Variable file 'wrong_path.py' does not exist
+    Check Stderr Contains  Resource file 'NonExisting.tsv' does not exist
+
+Test from other suite
+    Check Test Case  Some Other Test
+
+Import Library Keyword is Called
+    Check Test Case    ${TESTNAME}
+    Check Syslog Contains  Imported library 'String' with arguments [ ]
+ Check Syslog Contains Imported library 'ParameterLibrary' with arguments [ value | 42 ]
+
+*** Keywords ***
+Should have correct number of keywords
+    [Arguments]  ${test or uk}  ${exp number of kws}
+    Log  ${test or uk.kws}
+ Should Be Equal As Integers ${test or uk.kw_count} ${exp number of kws}
+
+Name and status should be
+    [Arguments]  ${kw}  ${name}  ${status}
+    Should Be Equal  ${kw.name}    ${name}
+    Should Be Equal  ${kw.status}  ${status}
=======================================
--- /dev/null
+++ /atest/robot/running/deprecated_runmode/exit_on_failure.txt Wed May 29 06:51:24 2013
@@ -0,0 +1,33 @@
+*** Settings ***
+Force Tags      pybot  jybot  regression
+Resource        atest_resource.txt
+
+*** Test Cases ***
+Exit On Failure
+ [Setup] Run Tests --runmode 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 + Check Test Case Suite3 First FAIL Critical failure occurred and ExitOnFailure option is in use
+
+Imports Are Skipped On Exit
+    Previous test should have passed  Exit On Failure
+    Should be empty  ${ERRORS.messages}
+
+Correct Suite Teardown Is Executed When Exitonfailure Is Used
+    [Setup]  Run Tests  --runmode exitonfailure  misc/suites
+    ${tsuite} =  Get Test Suite  Suites
+    Should Be Equal  ${tsuite.teardown.name}  BuiltIn.Log
+    ${tsuite} =  Get Test Suite  Fourth
+    Should Be Equal  ${tsuite.teardown.name}  BuiltIn.Log
+    ${tsuite} =  Get Test Suite  Tsuite3
+    Should Be Equal  ${tsuite.teardown}  ${None}
+
+Exit On Failure With Skip Teardown On Exit
+ [Setup] Run Tests --runmode ExitOnFailure --runmode SkipTeardownOnExit misc/suites
+    ${tcase} =  Check Test Case  Suite4 First
+    Should Be Equal  ${tcase.teardown}  ${None}
+    ${tsuite} =  Get Test Suite  Fourth
+    Should Be Equal  ${tsuite.teardown}  ${None}
+ Check Test Case SubSuite1 First FAIL Critical failure occurred and ExitOnFailure option is in use + Check Test Case Suite3 First FAIL Critical failure occurred and ExitOnFailure option is in use
=======================================
--- /dev/null
+++ /atest/robot/running/deprecated_runmode/fatal_exception.txt Wed May 29 06:51:24 2013
@@ -0,0 +1,60 @@
+*** Settings ***
+Force Tags      regression
+Default Tags    pybot  jybot
+Resource        atest_resource.txt
+
+*** Test Cases ***
+Exit From Python Keyword
+    Run Tests  ${EMPTY}  running/fatal_exception/01__python_library_kw.txt
+    ${tc}=  Check Test Case  ${TESTNAME}
+    Check Log Message  ${tc.teardown.msgs[0]}  This should be executed
+    Check Test Case  Test That Should Not Be Run 1
+
+Exit From Java Keyword
+    [tags]  jybot
+    Run Tests  ${EMPTY}  running/fatal_exception/03__java_library_kw.txt
+    Check Test Case  ${TESTNAME}
+    Check Test Case  Test That Should Not Be Run 3
+
+Multiple Suite Aware Exiting
+    Run Tests  ${EMPTY}  running/fatal_exception/
+    Check Test Case  Exit From Python Keyword
+    Check Test Case  Test That Should Not Be Run 1
+    Check Test Case  Test That Should Not Be Run 2.1
+    Check Test Case  Test That Should Not Be Run 2.2
+
+Skip Imports On Exit
+    Previous test should have passed  Multiple Suite Aware Exiting
+    Should be empty  ${ERRORS.messages}
+
+Multiple Suite Aware Exiting From Suite Setup
+    Run Tests  ${EMPTY}  running/fatal_exception_suite_setup/
+    Check Test Case  Test That Should Not Be Run 1
+    ${ts1} =  Get Test Suite  Suite Setup
+    Should End With  ${ts1.teardown.msgs[0].message}  Tearing down 1
+    Check Test Case  Test That Should Not Be Run 2.1
+    Check Test Case  Test That Should Not Be Run 2.2
+    ${ts2} =  Get Test Suite  Irrelevant
+    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/
+    Check Test Case  Test That Should Not Be Run 1
+    ${ts1} =  Get Test Suite  Suite Setup
+    Should Be Equal  ${ts1.teardown}  ${None}
+    Check Test Case  Test That Should Not Be Run 2.1
+    Check Test Case  Test That Should Not Be Run 2.2
+    ${ts2} =  Get Test Suite  Irrelevant
+    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
+    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
+    ${tcase} =  Check Test Case  Exit From Python Keyword
+    Should Be Equal  ${tcase.teardown}  ${None}
+    ${tsuite}  Get Test Suite  Python Library Kw
+    Should Be Equal  ${tsuite.teardown}  ${None}
=======================================
--- /dev/null
+++ /atest/robot/running/deprecated_runmode/random_order.txt Wed May 29 06:51:24 2013
@@ -0,0 +1,37 @@
+*** Settings ***
+Suite Setup     Check That Default Orders Are Correct
+Force Tags      pybot  jybot  regression
+Resource        ../../cli/runner/cli_resource.txt
+
+*** Variables ***
+${DEFAULT SUITE ORDER} [Suite First, Sub.Suite.1, Suite3, Suite4, Suite5, Suite10, Suite 6, SUite7, suiTe 8, Suite 9 Name] +${DEFAULT TEST ORDER} [test1, test2, test3, test4, test5, test6, test7, test8, test9, test10, test11, test12]
+
+*** Test Cases ***
+Randomizing Tests
+ [Setup] Run Tests --runmode random:test misc/multiple_suites/01__suite_first.html
+    Should Not Be Equal As Strings  ${SUITE.tests}  ${DEFAULT TEST ORDER}
+
+Randomizing Suites
+    [Setup]  Run Tests  --runmode RANDOM:SuitE  misc/multiple_suites
+    Should Not Be Equal As Strings  ${SUITE.suites}  ${DEFAULT SUITE ORDER}
+    ${tests} =  Get Tests
+    Should Be Equal As Strings  ${tests}  ${DEFAULT TEST ORDER}
+
+Randomizing Suites And Tests
+    [Setup]  Run Tests  --runmode random:all  misc/multiple_suites
+    Should Not Be Equal As Strings  ${SUITE.suites}  ${DEFAULT SUITE ORDER}
+    ${tests} =  Get Tests
+    Should Not Be Equal As Strings  ${tests}  ${DEFAULT TEST ORDER}
+
+*** Keywords ***
+Check That Default Orders Are Correct
+    Run Tests  ${EMPTY}  misc/multiple_suites
+    Should Be Equal As Strings  ${SUITE.suites}  ${DEFAULT SUITE ORDER}
+ Should Be Equal As Strings ${SUITE.suites[0].tests} ${DEFAULT TEST ORDER}
+
+Get Tests
+ Comment This keyword is needed as there is also one directory suite, which does not contain tests. + ${tests} = Set Variable If '${SUITE.suites[0].name}' == 'Sub.Suite.1' ${SUITE.suites[0].suites[0].tests} ${SUITE.suites[0].tests}
+    [Return]  ${tests}
+
=======================================
--- /dev/null
+++ /atest/robot/running/deprecated_runmode/stopping_with_signal.txt Wed May 29 06:51:24 2013
@@ -0,0 +1,135 @@
+*** Settings ***
+Force Tags      regression    pybot  jybot
+Resource        atest_resource.txt
+Library         ../ProcessManager.py
+Test Teardown   Run Keyword If Test Failed    Log Stdout And Stderr
+
+*** Variables ***
+${TEST FILE}    %{TEMPDIR}${/}signal-tests.txt
+
+
+*** Test Cases ***
+SIGINT Signal Should Stop Test Execution Gracefully
+    Start And Send Signal  without_any_timeout.txt  One SIGINT
+    Process Output For Graceful Shutdown
+    Check Test Cases Have Failed Correctly
+
+SIGTERM Signal Should Stop Test Execution Gracefully
+    [Tags]  x-exclude-on-windows
+    Start And Send Signal  without_any_timeout.txt  One SIGTERM
+    Process Output For Graceful Shutdown
+    Check Test Cases Have Failed Correctly
+
+Execution Is Stopped Even If Keyword Swallows Exception
+    [Documentation]  This only works with Python.
+    Run Keyword If    not "${PYTHON}"    Remove Tags    regression
+    Start And Send Signal  swallow_exception.txt  One SIGTERM
+    Process Output For Graceful Shutdown
+    Check Test Cases Have Failed Correctly
+
+One Signal Should Stop Test Execution Gracefully When Run Keyword Is Used
+    Start And Send Signal  run_keyword.txt  One SIGTERM
+    Process Output For Graceful Shutdown
+    Check Test Cases Have Failed Correctly
+
+One Signal Should Stop Test Execution Gracefully When Test Timeout Is Used
+    Start And Send Signal  test_timeout.txt  One SIGTERM
+    Process Output For Graceful Shutdown
+    Check Test Cases Have Failed Correctly
+
+One Signal Should Stop Test Execution Gracefully When Keyword Timeout Is Used
+    Start And Send Signal  keyword_timeout.txt  One SIGTERM
+    Process Output For Graceful Shutdown
+    Check Test Cases Have Failed Correctly
+
+Two SIGINT Signals Should Stop Test Execution Forcefully
+    Start And Send Signal  without_any_timeout.txt  Two SIGINTs  2s
+    Check Tests Have Been Forced To Shutdown
+
+Two SIGTERM Signals Should Stop Test Execution Forcefully
+    [Tags]  x-exclude-on-windows
+    Start And Send Signal  without_any_timeout.txt  Two SIGTERMs  2s
+    Check Tests Have Been Forced To Shutdown
+
+Two Signals Should Stop Test Execution Forcefully When Run Keyword Is Used
+    Start And Send Signal  run_keyword.txt  Two SIGINTs  2s
+    Check Tests Have Been Forced To Shutdown
+
+Two Signals Should Stop Test Execution Forcefully When Test Timeout Is Used
+    Start And Send Signal  test_timeout.txt  Two SIGINTs  2s
+    Check Tests Have Been Forced To Shutdown
+
+Two Signals Should Stop Test Execution Forcefully When Keyword Timeout Is Used
+    Start And Send Signal  keyword_timeout.txt  Two SIGINTs  2s
+    Check Tests Have Been Forced To Shutdown
+
+One Signal Should Stop Test Execution Gracefully And Test Case And Suite Teardowns Should Be Run
+    Start And Send Signal  with_teardown.txt  One SIGINT
+    Process Output For Graceful Shutdown
+    Check Test Cases Have Failed Correctly
+    ${tc} =  Get Test Case  Test
+    Check Log Message  ${tc.teardown.msgs[0]}  Logging Test Case Teardown
+    ${ts} =  Get Test Suite  With Teardown
+ 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
+    Process Output For Graceful Shutdown
+    Check Test Cases Have Failed Correctly
+    ${tc} =  Get Test Case  Test
+    Should Be Equal  ${tc.teardown}  ${None}
+    ${ts} =  Get Test Suite  With Teardown
+    Should Be Equal  ${ts.teardown}  ${None}
+
+
+*** Keywords ***
+Start And Send Signal
+ [Arguments] ${datasource} ${signals} ${sleep}=0s ${runmode}=normal
+    Remove File    ${TEST FILE}
+    Start Run    ${datasource}    ${sleep}    ${runmode}
+    Wait Until Created    ${TESTFILE}    timeout=45s
+    Run Keyword    ${signals}
+    Wait Until Finished
+
+Start Run
+    [Arguments]    ${datasource}    ${sleep}    ${runmode}
+    Set Runners
+ ${datasource} = Set Variables And Get Datasources running/stopping_with_signal/${datasource}
+    @{runner} =    Get Runner    ${INTERPRETER}    ${ROBOTPATH}
+    @{command} =    Create List
+    ...    @{runner}
+    ...    --output    ${OUTFILE}    --report    NONE    --log    NONE
+    ...    --variable    TESTSIGNALFILE:${TEST FILE}
+    ...    --variable    TEARDOWNSLEEP:${sleep}
+    ...    --runmode  ${runmode}
+    ...    ${datasource}
+    Log Many    @{command}
+    ProcessManager.start process    @{command}
+
+Check Test Cases Have Failed Correctly
+    Check Test Case    Test    FAIL    Execution terminated by signal
+ Check Test Case Test2 FAIL Test execution is stopped due to a fatal error
+
+Check Tests Have Been Forced To Shutdown
+    ${stderr} =    ProcessManager.Get Stderr
+    Should Contain    ${stderr}    Execution forcefully stopped
+
+Process Output For Graceful Shutdown
+    Wait Until Created    ${OUTFILE}    timeout=45s
+    Process Output    ${OUTFILE}
+
+One SIGINT
+    Send Terminate    SIGINT
+
+One SIGTERM
+    Send Terminate    SIGTERM
+
+Two SIGINTs
+    One SIGINT
+    Sleep    1s
+    One SIGINT
+
+Two SIGTERMs
+    One SIGTERM
+    Sleep    1s
+    One SIGTERM
=======================================
--- /atest/robot/cli/dryrun/deprecated_dryrun.txt       Tue May 28 06:28:33 2013
+++ /dev/null
@@ -1,114 +0,0 @@
-*** Settings ***
-Suite Setup Run Tests --runmode dryrun cli/dryrun/dryrun.txt cli/dryrun/more_tests.txt
-Force Tags      regression  pybot  jybot
-Resource        atest_resource.txt
-
-*** Test Cases ***
-
-Passing keywords
-    ${tc}=  Check Test Case  ${TESTNAME}
-    Should have correct number of keywords  ${tc}  3
-    Name and status should be  ${tc.kws[0]}  BuiltIn.Log  NOT_RUN
- Name and status should be ${tc.kws[1]} \${contents} = OperatingSystem.List Directory NOT_RUN
-    Name and status should be  ${tc.kws[2]}  resource.Simple UK  PASS
-    Name and status should be  ${tc.kws[2].kws[0]}  BuiltIn.Log  NOT_RUN
-
-Keywords with embedded arguments
-    ${tc}=  Check Test Case  ${TESTNAME}
-    Should have correct number of keywords  ${tc}  2
-    Name and status should be  ${tc.kws[0]}  Embedded arguments here  PASS
- Name and status should be ${tc.kws[0].kws[0]} BuiltIn.No Operation NOT_RUN
-    Name and status should be  ${tc.kws[1]}  Embedded args rock here  PASS
- Name and status should be ${tc.kws[1].kws[0]} BuiltIn.No Operation NOT_RUN
-
-Keywords that would fail
-    ${tc}=  Check Test Case  ${TESTNAME}
-    Should have correct number of keywords  ${tc}  3
-    Name and status should be  ${tc.kws[0]}  BuiltIn.Fail  NOT_RUN
-    Name and status should be  ${tc.kws[1]}  resource.Fail In UK  PASS
-    Should have correct number of keywords  ${tc.kws[1]}  2
-    Name and status should be  ${tc.kws[1].kws[0]}  BuiltIn.Fail  NOT_RUN
-    Name and status should be  ${tc.kws[1].kws[1]}  BuiltIn.Fail  NOT_RUN
-
-Scalar variables are not checked in keyword arguments
- [Documentation] Variables are too often set somehow dynamically that we cannot expect them to always exist.
-    ${tc}=  Check Test Case  ${TESTNAME}
-    Name and status should be  ${tc.kws[0]}  BuiltIn.Log  NOT_RUN
-    Name and status should be  ${tc.kws[1]}  BuiltIn.Log  NOT_RUN
-
-List variables are not checked in keyword arguments
-    [Documentation]  See the doc of the previous test
-    Check Test Case  ${TESTNAME}
-
-Variables are not checked in when arguments are embedded
-    [Documentation]  See the doc of the previous test
-    ${tc}=  Check Test Case  ${TESTNAME}
- Name and status should be ${tc.kws[0]} Embedded \${TESTNAME} here PASS - Name and status should be ${tc.kws[0].kws[0]} BuiltIn.No Operation NOT_RUN
-    Name and status should be  ${tc.kws[1]}  Embedded \${nonex} here  PASS
- Name and status should be ${tc.kws[1].kws[0]} BuiltIn.No Operation NOT_RUN
-
-User keyword return value
-    Check Test Case  ${TESTNAME}
-
-Test Setup and Teardown
-    ${tc}=  Check Test Case  ${TESTNAME}
-    Should have correct number of keywords  ${tc}  1
-    Should Be Equal  ${tc.setup.name}  BuiltIn.Log
-    Should Be Equal  ${tc.teardown.name}  Does not exist
-
-Keyword Teardown
-    ${tc}=  Check Test Case  ${TESTNAME}
-    Should have correct number of keywords  ${tc}  1
-    Should Be Equal  ${tc.kws[0].kws[1].name}  Does not exist
-
-For Loops
-    ${tc}=  Check Test Case  ${TESTNAME}
-    Should have correct number of keywords  ${tc}  3
-    Should have correct number of keywords  ${tc.kws[0]}  1
-    Should have correct number of keywords  ${tc.kws[0].kws[0]}  2
-    Should have correct number of keywords  ${tc.kws[1]}  3
-    Should have correct number of keywords  ${tc.kws[1].kws[1]}  1
-
-Non-existing keyword name
-    Check Test Case  ${TESTNAME}
-
-Too few arguments
-    Check Test Case  ${TESTNAME}
-
-Too few arguments for UK
-    Check Test Case  ${TESTNAME}
-
-Too many arguments
-    Check Test Case  ${TESTNAME}
-
-Invalid syntax in UK
-    Check Test Case  ${TESTNAME}
- Check Log Message ${ERRORS[0]} Creating user keyword 'Invalid Syntax UK' failed: Invalid argument '${arg'. ERROR
-
-Multiple Failures
-    Check Test Case  ${TESTNAME}
-
-Invalid imports
- Check Stderr Contains Importing test library 'DoesNotExist' failed: ImportError: No module named DoesNotExist
-    Check Stderr Contains  Variable file 'wrong_path.py' does not exist
-    Check Stderr Contains  Resource file 'NonExisting.tsv' does not exist
-
-Test from other suite
-    Check Test Case  Some Other Test
-
-Import Library Keyword is Called
-    Check Test Case    ${TESTNAME}
-    Check Syslog Contains  Imported library 'String' with arguments [ ]
- Check Syslog Contains Imported library 'ParameterLibrary' with arguments [ value | 42 ]
-
-*** Keywords ***
-Should have correct number of keywords
-    [Arguments]  ${test or uk}  ${exp number of kws}
-    Log  ${test or uk.kws}
- Should Be Equal As Integers ${test or uk.kw_count} ${exp number of kws}
-
-Name and status should be
-    [Arguments]  ${kw}  ${name}  ${status}
-    Should Be Equal  ${kw.name}    ${name}
-    Should Be Equal  ${kw.status}  ${status}
=======================================
--- /atest/robot/cli/runner/random_order_deprecated.txt Wed May 29 03:45:04 2013
+++ /dev/null
@@ -1,37 +0,0 @@
-*** Settings ***
-Suite Setup     Check That Default Orders Are Correct
-Force Tags      pybot  jybot  regression
-Resource        cli_resource.txt
-
-*** Variables ***
-${DEFAULT SUITE ORDER} [Suite First, Sub.Suite.1, Suite3, Suite4, Suite5, Suite10, Suite 6, SUite7, suiTe 8, Suite 9 Name] -${DEFAULT TEST ORDER} [test1, test2, test3, test4, test5, test6, test7, test8, test9, test10, test11, test12]
-
-*** Test Cases ***
-Randomizing Tests
- [Setup] Run Tests --runmode random:test misc/multiple_suites/01__suite_first.html
-    Should Not Be Equal As Strings  ${SUITE.tests}  ${DEFAULT TEST ORDER}
-
-Randomizing Suites
-    [Setup]  Run Tests  --runmode RANDOM:SuitE  misc/multiple_suites
-    Should Not Be Equal As Strings  ${SUITE.suites}  ${DEFAULT SUITE ORDER}
-    ${tests} =  Get Tests
-    Should Be Equal As Strings  ${tests}  ${DEFAULT TEST ORDER}
-
-Randomizing Suites And Tests
-    [Setup]  Run Tests  --runmode random:all  misc/multiple_suites
-    Should Not Be Equal As Strings  ${SUITE.suites}  ${DEFAULT SUITE ORDER}
-    ${tests} =  Get Tests
-    Should Not Be Equal As Strings  ${tests}  ${DEFAULT TEST ORDER}
-
-*** Keywords ***
-Check That Default Orders Are Correct
-    Run Tests  ${EMPTY}  misc/multiple_suites
-    Should Be Equal As Strings  ${SUITE.suites}  ${DEFAULT SUITE ORDER}
- Should Be Equal As Strings ${SUITE.suites[0].tests} ${DEFAULT TEST ORDER}
-
-Get Tests
- Comment This keyword is needed as there is also one directory suite, which does not contain tests. - ${tests} = Set Variable If '${SUITE.suites[0].name}' == 'Sub.Suite.1' ${SUITE.suites[0].suites[0].tests} ${SUITE.suites[0].tests}
-    [Return]  ${tests}
-

==============================================================================
Revision: 7c4808a7bf29
Branch:   default
Author:   Anssi Syrjäsalo
Date:     Wed May 29 06:51:36 2013
Log:      Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=7c4808a7bf29

Deleted:
 /atest/robot/cli/dryrun/deprecated_dryrun.txt
 /atest/robot/cli/runner/random_order_deprecated.txt

=======================================
--- /atest/robot/cli/dryrun/deprecated_dryrun.txt       Tue May 28 06:28:33 2013
+++ /dev/null
@@ -1,114 +0,0 @@
-*** Settings ***
-Suite Setup Run Tests --runmode dryrun cli/dryrun/dryrun.txt cli/dryrun/more_tests.txt
-Force Tags      regression  pybot  jybot
-Resource        atest_resource.txt
-
-*** Test Cases ***
-
-Passing keywords
-    ${tc}=  Check Test Case  ${TESTNAME}
-    Should have correct number of keywords  ${tc}  3
-    Name and status should be  ${tc.kws[0]}  BuiltIn.Log  NOT_RUN
- Name and status should be ${tc.kws[1]} \${contents} = OperatingSystem.List Directory NOT_RUN
-    Name and status should be  ${tc.kws[2]}  resource.Simple UK  PASS
-    Name and status should be  ${tc.kws[2].kws[0]}  BuiltIn.Log  NOT_RUN
-
-Keywords with embedded arguments
-    ${tc}=  Check Test Case  ${TESTNAME}
-    Should have correct number of keywords  ${tc}  2
-    Name and status should be  ${tc.kws[0]}  Embedded arguments here  PASS
- Name and status should be ${tc.kws[0].kws[0]} BuiltIn.No Operation NOT_RUN
-    Name and status should be  ${tc.kws[1]}  Embedded args rock here  PASS
- Name and status should be ${tc.kws[1].kws[0]} BuiltIn.No Operation NOT_RUN
-
-Keywords that would fail
-    ${tc}=  Check Test Case  ${TESTNAME}
-    Should have correct number of keywords  ${tc}  3
-    Name and status should be  ${tc.kws[0]}  BuiltIn.Fail  NOT_RUN
-    Name and status should be  ${tc.kws[1]}  resource.Fail In UK  PASS
-    Should have correct number of keywords  ${tc.kws[1]}  2
-    Name and status should be  ${tc.kws[1].kws[0]}  BuiltIn.Fail  NOT_RUN
-    Name and status should be  ${tc.kws[1].kws[1]}  BuiltIn.Fail  NOT_RUN
-
-Scalar variables are not checked in keyword arguments
- [Documentation] Variables are too often set somehow dynamically that we cannot expect them to always exist.
-    ${tc}=  Check Test Case  ${TESTNAME}
-    Name and status should be  ${tc.kws[0]}  BuiltIn.Log  NOT_RUN
-    Name and status should be  ${tc.kws[1]}  BuiltIn.Log  NOT_RUN
-
-List variables are not checked in keyword arguments
-    [Documentation]  See the doc of the previous test
-    Check Test Case  ${TESTNAME}
-
-Variables are not checked in when arguments are embedded
-    [Documentation]  See the doc of the previous test
-    ${tc}=  Check Test Case  ${TESTNAME}
- Name and status should be ${tc.kws[0]} Embedded \${TESTNAME} here PASS - Name and status should be ${tc.kws[0].kws[0]} BuiltIn.No Operation NOT_RUN
-    Name and status should be  ${tc.kws[1]}  Embedded \${nonex} here  PASS
- Name and status should be ${tc.kws[1].kws[0]} BuiltIn.No Operation NOT_RUN
-
-User keyword return value
-    Check Test Case  ${TESTNAME}
-
-Test Setup and Teardown
-    ${tc}=  Check Test Case  ${TESTNAME}
-    Should have correct number of keywords  ${tc}  1
-    Should Be Equal  ${tc.setup.name}  BuiltIn.Log
-    Should Be Equal  ${tc.teardown.name}  Does not exist
-
-Keyword Teardown
-    ${tc}=  Check Test Case  ${TESTNAME}
-    Should have correct number of keywords  ${tc}  1
-    Should Be Equal  ${tc.kws[0].kws[1].name}  Does not exist
-
-For Loops
-    ${tc}=  Check Test Case  ${TESTNAME}
-    Should have correct number of keywords  ${tc}  3
-    Should have correct number of keywords  ${tc.kws[0]}  1
-    Should have correct number of keywords  ${tc.kws[0].kws[0]}  2
-    Should have correct number of keywords  ${tc.kws[1]}  3
-    Should have correct number of keywords  ${tc.kws[1].kws[1]}  1
-
-Non-existing keyword name
-    Check Test Case  ${TESTNAME}
-
-Too few arguments
-    Check Test Case  ${TESTNAME}
-
-Too few arguments for UK
-    Check Test Case  ${TESTNAME}
-
-Too many arguments
-    Check Test Case  ${TESTNAME}
-
-Invalid syntax in UK
-    Check Test Case  ${TESTNAME}
- Check Log Message ${ERRORS[0]} Creating user keyword 'Invalid Syntax UK' failed: Invalid argument '${arg'. ERROR
-
-Multiple Failures
-    Check Test Case  ${TESTNAME}
-
-Invalid imports
- Check Stderr Contains Importing test library 'DoesNotExist' failed: ImportError: No module named DoesNotExist
-    Check Stderr Contains  Variable file 'wrong_path.py' does not exist
-    Check Stderr Contains  Resource file 'NonExisting.tsv' does not exist
-
-Test from other suite
-    Check Test Case  Some Other Test
-
-Import Library Keyword is Called
-    Check Test Case    ${TESTNAME}
-    Check Syslog Contains  Imported library 'String' with arguments [ ]
- Check Syslog Contains Imported library 'ParameterLibrary' with arguments [ value | 42 ]
-
-*** Keywords ***
-Should have correct number of keywords
-    [Arguments]  ${test or uk}  ${exp number of kws}
-    Log  ${test or uk.kws}
- Should Be Equal As Integers ${test or uk.kw_count} ${exp number of kws}
-
-Name and status should be
-    [Arguments]  ${kw}  ${name}  ${status}
-    Should Be Equal  ${kw.name}    ${name}
-    Should Be Equal  ${kw.status}  ${status}
=======================================
--- /atest/robot/cli/runner/random_order_deprecated.txt Wed May 29 03:45:04 2013
+++ /dev/null
@@ -1,37 +0,0 @@
-*** Settings ***
-Suite Setup     Check That Default Orders Are Correct
-Force Tags      pybot  jybot  regression
-Resource        cli_resource.txt
-
-*** Variables ***
-${DEFAULT SUITE ORDER} [Suite First, Sub.Suite.1, Suite3, Suite4, Suite5, Suite10, Suite 6, SUite7, suiTe 8, Suite 9 Name] -${DEFAULT TEST ORDER} [test1, test2, test3, test4, test5, test6, test7, test8, test9, test10, test11, test12]
-
-*** Test Cases ***
-Randomizing Tests
- [Setup] Run Tests --runmode random:test misc/multiple_suites/01__suite_first.html
-    Should Not Be Equal As Strings  ${SUITE.tests}  ${DEFAULT TEST ORDER}
-
-Randomizing Suites
-    [Setup]  Run Tests  --runmode RANDOM:SuitE  misc/multiple_suites
-    Should Not Be Equal As Strings  ${SUITE.suites}  ${DEFAULT SUITE ORDER}
-    ${tests} =  Get Tests
-    Should Be Equal As Strings  ${tests}  ${DEFAULT TEST ORDER}
-
-Randomizing Suites And Tests
-    [Setup]  Run Tests  --runmode random:all  misc/multiple_suites
-    Should Not Be Equal As Strings  ${SUITE.suites}  ${DEFAULT SUITE ORDER}
-    ${tests} =  Get Tests
-    Should Not Be Equal As Strings  ${tests}  ${DEFAULT TEST ORDER}
-
-*** Keywords ***
-Check That Default Orders Are Correct
-    Run Tests  ${EMPTY}  misc/multiple_suites
-    Should Be Equal As Strings  ${SUITE.suites}  ${DEFAULT SUITE ORDER}
- Should Be Equal As Strings ${SUITE.suites[0].tests} ${DEFAULT TEST ORDER}
-
-Get Tests
- Comment This keyword is needed as there is also one directory suite, which does not contain tests. - ${tests} = Set Variable If '${SUITE.suites[0].name}' == 'Sub.Suite.1' ${SUITE.suites[0].suites[0].tests} ${SUITE.suites[0].tests}
-    [Return]  ${tests}
-

--

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