Author: laukpe
Date: Wed Nov 19 14:39:23 2008
New Revision: 1007
Added:
trunk/atest/testdata/variables/resvarfiles/resource.html
- copied unchanged from r1006,
/trunk/atest/testdata/variables/resvarfiles/resource_with_variables.html
trunk/atest/testdata/variables/resvarfiles/variables.py
- copied unchanged from r1006,
/trunk/atest/testdata/variables/resvarfiles/variable_file.py
Removed:
trunk/atest/testdata/variables/resvarfiles/resource_with_variables.html
trunk/atest/testdata/variables/resvarfiles/variable_file.py
Modified:
trunk/atest/testdata/variables/variable_priorities.html
trunk/atest/testdata/variables/variables_from_resource_files.html
trunk/atest/testdata/variables/variables_from_variable_files.html
Log:
renamed some files and fixed tests
Modified: trunk/atest/testdata/variables/variable_priorities.html
==============================================================================
--- trunk/atest/testdata/variables/variable_priorities.html (original)
+++ trunk/atest/testdata/variables/variable_priorities.html Wed Nov 19
14:39:23 2008
@@ -70,12 +70,12 @@
<tbody>
<tr><td>Documentation</td><td>Some of these tests are testing same
features as tests under
core/resource_and_variable_imports.html.</td><td>These tests should all be
gone through and all tests moved under
variables/.</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
<td>Resource</td>
-<td>resvarfiles/resource_with_variables.html</td>
+<td>resvarfiles/resource.html</td>
<td></td>
<td></td>
<td></td>
</tr>
-<tr><td>Variables</td><td>resvarfiles/variable_file.py</td><td></td><td></td><td></td></tr><tr>
+<tr><td>Variables</td><td>resvarfiles/variables.py</td><td></td><td></td><td></td></tr><tr>
<td>Variables</td><td>resvarfiles/variables_2.py</td>
<td></td>
Modified: trunk/atest/testdata/variables/variables_from_resource_files.html
==============================================================================
--- trunk/atest/testdata/variables/variables_from_resource_files.html
(original)
+++ trunk/atest/testdata/variables/variables_from_resource_files.html Wed
Nov 19 14:39:23 2008
@@ -65,7 +65,7 @@
<tbody>
<tr>
<td>Resource</td>
-<td>resource_with_variables.html</td>
+<td>resvarfiles/resource.html</td>
<td></td>
<td></td>
<td></td>
Modified: trunk/atest/testdata/variables/variables_from_variable_files.html
==============================================================================
--- trunk/atest/testdata/variables/variables_from_variable_files.html
(original)
+++ trunk/atest/testdata/variables/variables_from_variable_files.html Wed
Nov 19 14:39:23 2008
@@ -65,18 +65,12 @@
<tbody>
<tr>
<td>Variables</td>
-<td>variable_file.py</td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td align="undefined" valign="undefined"></td>
-<td align="undefined" valign="undefined"></td>
+<td>resvarfiles/variables.py</td>
<td></td>
<td></td>
<td></td>
</tr>
+
<tr>
<td align="undefined" valign="undefined"></td>
<td align="undefined" valign="undefined"></td>
