resvarfiles

codesite-noreply Mon, 24 Nov 2008 05:13:30 -0800


Author: laukpe
Date: Mon Nov 24 05:02:12 2008
New Revision: 1083


Modified:
   trunk/atest/robot/variables/commandline_variable_files.html
   trunk/atest/testdata/variables/commandline_variable_files.html
   trunk/atest/testdata/variables/resvarfiles/cli_vars_2.py

Log:

tests for 1) args for cli var files, 2) handling failures gracefully whencli var files are taken into use


Modified: trunk/atest/robot/variables/commandline_variable_files.html
==============================================================================
--- trunk/atest/robot/variables/commandline_variable_files.html (original)

+++ trunk/atest/robot/variables/commandline_variable_files.html Mon Nov 2405:02:12 2008

@@ -115,8 +115,8 @@
 <th>Argument</th>
 <th>Argument</th>
 <th>Argument</th>
-<th>Argument</th>
-<th>Argument</th>
+
+
 </tr>
 </thead>
 <tbody>
@@ -126,18 +126,18 @@
 <td>Variables From Variable File</td>
 <td></td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>
 <tr>
-<td>Variables From Variable File Using 'get_variables'</td>
+<td>Arguments To Variable Files</td>
 <td>Check Test Case</td>
-<td>Variables From Variable File Using 'get_variables'</td>
-<td></td>
+<td>Arguments To Variable Files</td>
 <td></td>
 <td></td>
-<td></td>
-</tr>
+
+

+</tr><tr><td>Non-Existing Variable File</td><td>Check StderrContains</td><td>[ ERROR ] </td><td> Processing variablefile 'non_existing.py' failed:</td><td>Importing 'non_existing.py' failed:File does not exist</td></tr><tr><td>Too Few Arguments To VariableFile</td><td>Check Stderr Contains</td><td>[ ERROR] </td><td>Processing variable file '${VARFILE2}'failed: </td><td>TypeError: get_variables() </td></tr><tr><td>TooMany Arguments To Variable File</td><td>Check Stderr Contains</td><td>[ERROR ] </td><td>Processing variable file '${VARFILE2}' with arguments[ too | many | args ] failed:</td><td> TypeError:get_variables()  </td></tr><tr><td>Invalid VariableFile</td><td>Check Stderr Contains</td><td>[ ERROR] </td><td>Processing variable file '${VARFILE2}' with arguments [FAIL ] failed:</td><td>ZeroDivisionError:</td></tr>

 </tbody>
 </table>
 <table border="1">
@@ -155,13 +155,13 @@

<tr><td>Run Test Data</td><td align="undefined"valign="undefined">${vardir} =</td><td align="undefined"valign="undefined">Join Path</td><td align="undefined"valign="undefined">${CURDIR}${/}..${/}..${/}testdata</td><td align="undefined"valign="undefined">-variables${/}resvarfiles</td></tr><tr><td></td><td align="undefined"valign="undefined">${varfile} = </td><td align="undefined"valign="undefined">Join Path</td><td align="undefined"valign="undefined">${vardir}</td><td align="undefined"valign="undefined">cli_vars.py</td></tr><tr><td></td><td align="undefined"valign="undefined">${varfile2} = </td><td align="undefined"valign="undefined">Join Path</td><td align="undefined"valign="undefined">${vardir}</td><td align="undefined"valign="undefined">cli_vars_2.py</td></tr><tr>+variables${/}resvarfiles</td></tr><tr><td></td><td align="undefined"valign="undefined">${varfile} = </td><td align="undefined"valign="undefined">Join Path</td><td align="undefined"valign="undefined">${vardir}</td><td align="undefined"valign="undefined">cli_vars.py</td></tr><tr><td></td><td align="undefined"valign="undefined">${varfile2} = </td><td align="undefined"valign="undefined">Join Path</td><td align="undefined"valign="undefined">${vardir}</td><td align="undefined"valign="undefined">cli_vars_2.py</td></tr><tr><td></td><tdalign="undefined" valign="undefined">${varfile3} = </td><tdalign="undefined" valign="undefined">Join Path</td><tdalign="undefined"valign="undefined">${vardir}</td><td>cli_vars_invalid.py</td></tr><tr>

 <td></td>
 <td>Run Tests</td>
-<td>--variablefile ${varfile}<br>-V ${varfile2}</td>

+<td>--variablefile ${varfile} -V ${varfile2}:arg -V${varfile2}:arg2:given --variablefile non_existing.py --variablefile${varfile2} -V ${varfile2}:too:many:args -V ${varfile2}:FAIL</td>

 <td>variables${/}commandline_variable_files.html</td>
 <td></td>
-</tr>

+</tr><tr><td></td><td>Set SuiteVariable</td><td>$VARFILE2</td><td></td><td></td></tr>

 </tbody>
 </table>
 </body></html>

Modified: trunk/atest/testdata/variables/commandline_variable_files.html
==============================================================================

--- trunk/atest/testdata/variables/commandline_variable_files.html(original)+++ trunk/atest/testdata/variables/commandline_variable_files.html Mon Nov24 05:02:12 2008

@@ -126,24 +126,8 @@
 </tr>
 </thead>
 <tbody>
-<tr>
-<td>Normal Text&nbsp;</td>
-<td>Should Be Equal</td>
-<td>${NORMAL TEXT}</td>
-<td>Hello</td>
-<td></td>

-
-</tr>

-<tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>EscapedText</td><td>Should Be Equal</td><td>${ESCAPED}</td><td>"I'lltake spam & eggs!!"</td><td></td></tr><tr><td></td><td>ShouldBe Equal</td><td>${ESCAPED2}</td><td>\${notvar}</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr>

-<td>No Colon In Variable</td>
-<td>Should Be Equal</td>
-<td>${NO COLON}</td>
-<td>${EMPTY}</td>
-<td></td>
-
-

-</tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>VariablesFromVariable File</td><td>Should Be Equal</td><td>${SCALAR}</td><td>Scalarfrom variable file from CLI</td><td></td></tr><tr><td></td><td>Should BeEqual</td><td>${SCALAR WITH ESCAPES}</td><td>1 \\ 2\\\\\${inv}</td><td></td></tr><tr><td></td><td>Should Be Equal</td><td>${SCALARLIST}</td><td>${EXPECTED LIST}</td><td></td></tr><tr><td></td><td>Should BeTrue</td><td>@{LIST} == ${EXPECTEDLIST}</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>VariablesFrom Variable File Using 'get_variables'</td><td>Should BeEqual</td><td>${ANOTHER SCALAR}</td><td>Variable from CLI var file withget_variables</td><td></td></tr><tr><td></td><td>Should BeTrue</td><td>@{ANOTHER LIST} == ['List variable from CLI var file', 'withget_variables'] </td><td></td><td></td></tr>+<tr><td>Variables From Variable File</td><td>Should BeEqual</td><td>${SCALAR}</td><td>Scalar from variable file fromCLI</td><td></td></tr><tr><td></td><td>Should BeEqual</td><td>${SCALAR WITH ESCAPES}</td><td>1 \\ 2\\\\\${inv}</td><td></td></tr><tr><td></td><td>Should Be Equal</td><td>${SCALARLIST}</td><td>${EXPECTED LIST}</td><td></td></tr><tr><td></td><td>Should BeTrue</td><td>@{LIST} == ${EXPECTEDLIST}</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>ArgumentsTo Variable Files</td><td>Should Be Equal</td><td>${ANOTHERSCALAR}</td><td>Variable from CLI var file withget_variables</td><td></td></tr><tr><td></td><td>Should BeTrue</td><td>@{ANOTHER LIST} == ['List variable from CLI var file', 'withget_variables'] </td><td></td><td></td></tr><tr><td></td><td>Should BeEqual</td><td>${ARG}</td><td>defaultvalue</td><td></td></tr><tr><td></td><td>Should Be Equal</td><td>${ARG2}</td><td>given</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr>

 </tbody>
 </table>
 <table border="1">

Modified: trunk/atest/testdata/variables/resvarfiles/cli_vars_2.py
==============================================================================
--- trunk/atest/testdata/variables/resvarfiles/cli_vars_2.py    (original)

+++ trunk/atest/testdata/variables/resvarfiles/cli_vars_2.py Mon Nov 2405:02:12 2008

@@ -1,5 +1,8 @@
-def get_variables():

- varz = { 'ANOTHER_SCALAR': 'Variable from CLI var file withget_variables',

+def get_variables(name, value='default value'):
+    if name == 'FAIL':
+        1/0
+    varz = { name: value,

+ 'ANOTHER_SCALAR': 'Variable from CLI var file withget_variables',

              'LIST__ANOTHER_LIST': ['List variable from CLI var file',
                                     'with get_variables'] }
     for name in 'PRIORITIES_1', 'PRIORITIES_2', 'PRIORITIES_2B':

[robotframework commit] r1083 - in trunk/atest: robot/variables testdata/variables testdata/variables/resvarfiles

Reply via email to