[robotframework] 3 new revisions pushed by jussi.ao...@gmail.com on 2013-05-30 15:18 GMT

[robotframework]

3 new revisions:

Revision: 1989c8cfba54
Branch:   default
Author:   Jussi Malinen <jussi.ao.mali...@gmail.com>
Date:     Thu May 30 08:05:42 2013
Log:      fix test for non existing suite setup and teardown variable  
resolution
http://code.google.com/p/robotframework/source/detail?r=1989c8cfba54
Revision: cd4c0154b556
Branch:   default
Author:   Jussi Malinen <jussi.ao.mali...@gmail.com>
Date:     Thu May 30 08:05:48 2013
Log:      Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=cd4c0154b556

Revision: 2e3fec9d5e84
Branch:   default
Author:   Jussi Malinen <jussi.ao.mali...@gmail.com>
Date:     Thu May 30 08:18:38 2013
Log:      test that tags and metadata with non existing variables are okay
http://code.google.com/p/robotframework/source/detail?r=2e3fec9d5e84

==============================================================================
Revision: 1989c8cfba54
Branch:   default
Author:   Jussi Malinen <jussi.ao.mali...@gmail.com>
Date:     Thu May 30 08:05:42 2013
Log:      fix test for non existing suite setup and teardown variable  
resolution
http://code.google.com/p/robotframework/source/detail?r=1989c8cfba54

Modified:
 /atest/robot/core/test_and_uk_settings.txt
 /atest/testdata/core/test_and_uk_settings.html

=======================================
--- /atest/robot/core/test_and_uk_settings.txt  Fri May 10 00:12:22 2013
+++ /atest/robot/core/test_and_uk_settings.txt  Thu May 30 08:05:42 2013
@@ -116,22 +116,21 @@
     Check Stderr Contains  [ ERROR ] Error in file '${PATH}' in  
table 'Keyword': Invalid syntax in keyword 'UK With Invalid Meta Passing':  
Non-existing setting 'Invalid UK Meta'.
     Check Stderr Contains  [ ERROR ] Error in file '${PATH}' in  
table 'Keyword': Invalid syntax in keyword 'UK With Invalid Meta Failing':  
Non-existing setting 'Invalid'.

-Non Existing Variable In Suite Setup And Teardown
+Non Existing Variable In Suite Setup and Teardown
     Run Tests  ${EMPTY}  core/test_and_uk_settings.html
     Should Be Equal  ${SUITE.status}  FAIL
-    ${errors} =    Catenate    SEPARATOR=\n
-    ...    Replacing variables from Setup failed: Non-existing  
variable '\${SUITE_FIXTURE_FROM_CLI}'.
-    ...    Replacing variables from Teardown failed: Non-existing  
variable '\${SUITE_FIXTURE_FROM_CLI}'.
-    ...    Replacing variables from setting 'Var from CLI' failed:  
Non-existing variable '\${META_FROM_CLI}'.
-    ${exp} =  Catenate  SEPARATOR=\n
-    Should Be Equal  ${SUITE.message}  Suite initialization  
failed:\n${errors}
+    ${errors} =    Catenate   SEPARATOR=\n
+                   ...        Non-existing  
variable '\${SUITE_SETUP_FROM_CLI}'.\n
+                   ...        Also suite teardown failed:
+                   ...        Non-existing  
variable '\${SUITE_TEARDOWN_FROM_CLI}'.
+    Should Be Equal  ${SUITE.message}  Suite setup failed:\n${errors}
     ${tc} =  Get Test Case  Test Case Documentation
     Should Be Equal  ${tc.status}  FAIL
-    Should Be Equal  ${tc.message}  Initialization of the parent suite  
failed:\n${errors}
+    Should Be Equal  ${tc.message}  Parent suite setup  
failed:\nNon-existing variable '\${SUITE_SETUP_FROM_CLI}'.

 *** Keywords ***
 My Setup
-    Run Tests  --variable suite_doc_from_cli:Hello --variable  
suite_fixture_from_cli:Log --variable meta_from_cli:my_metadata   
core${/}test_and_uk_settings.html
+    Run Tests  --variable suite_doc_from_cli:Hello --variable  
suite_setup_from_cli:Log --variable suite_teardown_from_cli:Log --variable  
meta_from_cli:my_metadata  core${/}test_and_uk_settings.html
     ${PATH} =  Normalize Path   
${CURDIR}/../../testdata/core/test_and_uk_settings.html
     Set Suite Variable  $PATH

=======================================
--- /atest/testdata/core/test_and_uk_settings.html      Fri May 10 00:12:22 2013
+++ /atest/testdata/core/test_and_uk_settings.html      Thu May 30 08:05:42 2013
@@ -147,14 +147,14 @@
     </tr>
     <tr>
       <td>Suitesetup</td>
-      <td>${SUITE_FIXTURE_FROM_CLI}</td>
+      <td>${SUITE_SETUP_FROM_CLI}</td>
       <td>${default}&nbsp;suite setup</td>
       <td># Global variables work here</td>
       <td></td>
     </tr>
     <tr>
       <td>Suite Teardown</td>
-      <td>${SUITE_FIXTURE_FROM_CLI}</td>
+      <td>${SUITE_TEARDOWN_FROM_CLI}</td>
       <td></td>
       <td></td>
       <td># ROW 15</td>

==============================================================================
Revision: cd4c0154b556
Branch:   default
Author:   Jussi Malinen <jussi.ao.mali...@gmail.com>
Date:     Thu May 30 08:05:48 2013
Log:      Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=cd4c0154b556



==============================================================================
Revision: 2e3fec9d5e84
Branch:   default
Author:   Jussi Malinen <jussi.ao.mali...@gmail.com>
Date:     Thu May 30 08:18:38 2013
Log:      test that tags and metadata with non existing variables are okay
http://code.google.com/p/robotframework/source/detail?r=2e3fec9d5e84

Modified:
 /atest/robot/core/test_and_uk_settings.txt
 /atest/testdata/core/test_and_uk_settings.html

=======================================
--- /atest/robot/core/test_and_uk_settings.txt  Thu May 30 08:05:42 2013
+++ /atest/robot/core/test_and_uk_settings.txt  Thu May 30 08:18:38 2013
@@ -15,8 +15,8 @@
     [Documentation]  Check that variables work in test case tags and  
invalid variables are handled correctly
     Check Test Tags  Test Case Tags With Variables  force-1  test-1   
test-2  test-3  test-4  test-5

-Test Case Tags With Non-Existing Variables
-    Check Test Tags  Test Case Tags With Non-Existing Variables   
\${non_existing}  \@{non_existing}  force-1
+Test Case Tags With Non-Existing Variables is Okay
+    Check Test Tags  Test Case Tags With Non-Existing Variables    
\${non_existing} \@{non_existing}  force-1

 Test Case Setup
     ${test} =  Check Test Case  Test Case Setup
@@ -127,6 +127,12 @@
     ${tc} =  Get Test Case  Test Case Documentation
     Should Be Equal  ${tc.status}  FAIL
     Should Be Equal  ${tc.message}  Parent suite setup  
failed:\nNon-existing variable '\${SUITE_SETUP_FROM_CLI}'.
+
+Non existing variable in suite metadata is okay
+    Run Tests  --variable suite_setup_from_cli:Log --variable  
suite_teardown_from_cli:Log --test TestCaseDocumentation   
core/test_and_uk_settings.html
+    Should Be Equal  ${SUITE.status}  PASS
+    Should Be Empty  ${SUITE.message}
+    Should be Equal  ${SUITE.metadata['Var From CLI']}       
\${META_FROM_CLI}

 *** Keywords ***
 My Setup
=======================================
--- /atest/testdata/core/test_and_uk_settings.html      Thu May 30 08:05:42 2013
+++ /atest/testdata/core/test_and_uk_settings.html      Thu May 30 08:18:38 2013
@@ -526,9 +526,9 @@
     </tr>
     <tr>
       <td>Test Case Tags With Non-Existing Variables</td>
-      <td>[ Document ]</td>
-      <td>FAIL</td>
-      <td>Test case initialization failed:\n<br>Replacing variables from  
setting 'Tags' failed: Non-existing variable '\@{non_existing}'.</td>
+      <td></td>
+      <td></td>
+      <td></td>
       <td></td>
     </tr>
     <tr>
@@ -540,7 +540,7 @@
     </tr>
     <tr>
       <td></td>
-      <td>Fail</td><td>Not executed</td>
+      <td>Log</td><td>This is okay</td>
       <td></td>
       <td></td>
     </tr>

--

--- 
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 robotframework-commit+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.