Revision: 6ec03ac75797
Author:   Pekka Klärck
Date:     Tue Jan  3 15:13:35 2012
Log: Fixed test to expect variable files not to be re-imported if same file is imported multiple times.

Update issue 1016
Tests fixed.
http://code.google.com/p/robotframework/source/detail?r=6ec03ac75797

Modified:
 /atest/robot/variables/same_variable_file_names.txt
 /atest/testdata/variables/same_variable_file_names/same_file.txt

=======================================
--- /atest/robot/variables/same_variable_file_names.txt Thu Dec 22 04:39:04 2011 +++ /atest/robot/variables/same_variable_file_names.txt Tue Jan 3 15:13:35 2012
@@ -8,14 +8,12 @@


 *** Test Cases ***
-Different Variable Files
+Different Variable Files Are Imported Correctly
[Documentation] Verifies that it is possible to import different variable ... files even when they have the same name. Verifies that new variables ... are imported, existing overridden, and old ones not visible anymore.
     Check Test Suite    Different Variable Files    ${6 TESTS}

-Same Variable File
- [Documentation] Verifies that module is re-imported even if same variable
-    ...    file is imported multiple times.
-    Check Test Case   Importing Same Variable File Always Re-Imports Module
-
+Same Variable File Is Not Re-Imported
+ Check Test Case Importing Same Variable File Does Not Re-Import Module
+
=======================================
--- /atest/testdata/variables/same_variable_file_names/same_file.txt Thu Dec 22 04:39:04 2011 +++ /atest/testdata/variables/same_variable_file_names/same_file.txt Tue Jan 3 15:13:35 2012
@@ -6,7 +6,7 @@

 *** Test Cases ***

-Importing Same Variable File Always Re-Imports Module
+Importing Same Variable File Does Not Re-Import Module
     Test Import    initial value
Sleep 1 second Make sure py and pyc files get different timestamps
     Test Import    new value
@@ -17,5 +17,5 @@
     [Arguments]    ${value}
     Create File    ${VARFILE}    VAR = '${value}'
     Import Variables    ${VARFILE}
-    Should Be Equal    ${VAR}    ${value}
-
+    Should Be Equal    ${VAR}    initial value
+

Reply via email to