4 new revisions:
Revision: 7fb1456ee659
Branch: default
Author: Pekka Klärck
Date: Thu May 30 05:16:06 2013
Log: __repr__ to model objects
http://code.google.com/p/robotframework/source/detail?r=7fb1456ee659
Revision: e8aec3088439
Branch: default
Author: Pekka Klärck
Date: Thu May 30 05:48:17 2013
Log: mege
http://code.google.com/p/robotframework/source/detail?r=e8aec3088439
Revision: 8298a305eb33
Branch: default
Author: Pekka Klärck
Date: Thu May 30 06:08:32 2013
Log: fixed import error tests
http://code.google.com/p/robotframework/source/detail?r=8298a305eb33
Revision: e2474ee22efc
Branch: default
Author: Pekka Klärck
Date: Thu May 30 06:08:40 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=e2474ee22efc
==============================================================================
Revision: 7fb1456ee659
Branch: default
Author: Pekka Klärck
Date: Thu May 30 05:16:06 2013
Log: __repr__ to model objects
http://code.google.com/p/robotframework/source/detail?r=7fb1456ee659
Modified:
/src/robot/model/modelobject.py
=======================================
--- /src/robot/model/modelobject.py Tue Mar 6 00:46:30 2012
+++ /src/robot/model/modelobject.py Thu May 30 05:16:06 2013
@@ -24,3 +24,6 @@
def __str__(self):
return unicode(self).encode('ASCII', 'replace')
+
+ def __repr__(self):
+ return repr(str(self))
==============================================================================
Revision: e8aec3088439
Branch: default
Author: Pekka Klärck
Date: Thu May 30 05:48:17 2013
Log: mege
http://code.google.com/p/robotframework/source/detail?r=e8aec3088439
Deleted:
/atest/robot/running/deprecated_runmode/invalid_runmode.txt
=======================================
--- /atest/robot/running/deprecated_runmode/invalid_runmode.txt Thu May 30
03:59:56 2013
+++ /dev/null
@@ -1,8 +0,0 @@
-*** Settings ***
-Force Tags regression pybot jybot
-Resource ../../cli/runner/cli_resource.txt
-
-
-*** Test Cases ***
-Invalid Runmode
- Run Should Fail --runmode INVALID ${TESTFILE} Option '--runmode'
does not support value 'INVALID'.
==============================================================================
Revision: 8298a305eb33
Branch: default
Author: Pekka Klärck
Date: Thu May 30 06:08:32 2013
Log: fixed import error tests
http://code.google.com/p/robotframework/source/detail?r=8298a305eb33
Modified:
/atest/robot/core/invalid_syntax.txt
/atest/robot/core/resource_and_variable_imports.txt
/atest/testdata/core/resource_and_variable_imports.txt
/atest/testdata/core/resources_and_variables/resources.html
/src/robot/new_running/model.py
=======================================
--- /atest/robot/core/invalid_syntax.txt Wed Sep 12 05:53:30 2012
+++ /atest/robot/core/invalid_syntax.txt Thu May 30 06:08:32 2013
@@ -11,19 +11,19 @@
Equals ${test.doc} This test should be executed and PASS
Library Imports
- Verify Error Library setting requires a name Setting
- Verify Error Importing test library 'NonExistingLibrary' failed:
ImportError: Setting
+ Verify Error Library setting requires a name Settings
+ Verify Error Importing test library 'NonExistingLibrary' failed:
ImportError: Settings
Check Test Case Check Valid Library Import
- Verify Error Replacing variables from setting 'Library' failed:
Resolving variable '\${unicode���}' failed: Non-existing
variable '\${unicodeï}'. Setting
+ Verify Error Replacing variables from setting 'Library' failed:
Resolving variable '\${unicode���}' failed: Non-existing
variable '\${unicodeï}'. Settings
Resource Imports
- Verify Error Resource file 'non-existing-resource.html' does not
exist Setting
- Verify Error Resource setting requires a name Setting
+ Verify Error Resource file 'non-existing-resource.html' does not
exist Settings
+ Verify Error Resource setting requires a name Settings
Check Test Case Check Valid Resource Import
Variable File Imports
- Verify Error Variable file 'non-existing-variables.py' does not
exist Setting
- Verify Error Variables setting requires a name Setting
+ Verify Error Variable file 'non-existing-variables.py' does not
exist Settings
+ Verify Error Variables setting requires a name Settings
Check Test Case Check Valid Variable File Import
Invalid Setting
=======================================
--- /atest/robot/core/resource_and_variable_imports.txt Fri May 10 07:49:10
2013
+++ /atest/robot/core/resource_and_variable_imports.txt Thu May 30 06:08:32
2013
@@ -147,7 +147,7 @@
[Arguments] ${path} @{error parts}
${path} = Join Path ${DATADIR} ${path}
${error} = Catenate @{error parts}
- Check Stderr Contains [ ERROR ] Error in file '${path}' in
table 'Setting': ${error}
+ Check Stderr Contains [ ERROR ] Error in file '${path}' in
table 'Settings': ${error}
File Should Have Already Been Imported
[Arguments] ${type} ${path} ${arguments}= ${suite}=Resource
And Variable Imports
=======================================
--- /atest/testdata/core/resource_and_variable_imports.txt Fri May 10
07:49:10 2013
+++ /atest/testdata/core/resource_and_variable_imports.txt Thu May 30
06:08:32 2013
@@ -1,4 +1,4 @@
-*** Setting ***
+*** Settings ***
Documentation NO RIDE: Imports contain invalid syntax on purpose
Resource resources_and_variables/resources.html
=======================================
--- /atest/testdata/core/resources_and_variables/resources.html Sun Apr 17
23:56:11 2011
+++ /atest/testdata/core/resources_and_variables/resources.html Thu May 30
06:08:32 2013
@@ -3,7 +3,7 @@
-
+
<style type="text/css">
html { font-family: Arial,Helvetica,sans-serif;
background-color: white;
@@ -48,13 +48,13 @@
letter-spacing: 0.1em;
}
th { font-style: normal; } /* required for IE */
-
+
</style><title>Robot Resources</title>
-
-
-
+
+
+
<link rel="stylesheet" href="resources/css/testdata.css"
type="text/css"></head><body>
@@ -71,7 +71,7 @@
<tr>
- <th>Setting</th>
+ <th>Settings</th>
<th>Value</th>
@@ -151,7 +151,7 @@
<td align="undefined" valign="undefined"><br>
</td>
</tr>
-
+
<tr>
<td style="vertical-align: top;">Resource<br>
</td>
@@ -194,7 +194,7 @@
</td></tr>
-
+
</tbody>
</table>
@@ -287,7 +287,7 @@
</tr>
-
+
</tbody>
</table>
@@ -374,7 +374,7 @@
</tr>
-
+
</tbody>
</table>
=======================================
--- /src/robot/new_running/model.py Thu May 30 02:01:32 2013
+++ /src/robot/new_running/model.py Thu May 30 06:08:32 2013
@@ -204,5 +204,5 @@
def report_invalid_syntax(self, message, level='ERROR'):
# TODO: Remove table information from error message here and
# also from _TestData.report_invalid_syntax in parsing/model.py
- LOGGER.write("Error in file '%s' in table 'Setting': %s"
+ LOGGER.write("Error in file '%s' in table 'Settings': %s"
% (self.source or '<unknown>', message), level)
==============================================================================
Revision: e2474ee22efc
Branch: default
Author: Pekka Klärck
Date: Thu May 30 06:08:40 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=e2474ee22efc
--
---
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.
