4 new revisions:
Revision: 283abf281fb4
Branch: default
Author: Pekka Klärck
Date: Fri Sep 14 13:35:59 2012
Log: hopefully fixed bytestring related tests on ipy. would be easier
if i ...
http://code.google.com/p/robotframework/source/detail?r=283abf281fb4
Revision: 68f7958a06ac
Branch: default
Author: Pekka Klärck
Date: Fri Sep 14 13:52:35 2012
Log: cleaned up tests related to trace logging non-ascii return
values. now...
http://code.google.com/p/robotframework/source/detail?r=68f7958a06ac
Revision: 45566b8f4160
Branch: default
Author: Pekka Klärck
Date: Fri Sep 14 14:02:26 2012
Log: updated libdoc's non-ASCII test hopefully to work with ipy
http://code.google.com/p/robotframework/source/detail?r=45566b8f4160
Revision: f2385f892862
Branch: default
Author: Pekka Klärck
Date: Fri Sep 14 14:09:02 2012
Log: hopefully fixed non-ASCII variable tests with ipy
http://code.google.com/p/robotframework/source/detail?r=f2385f892862
==============================================================================
Revision: 283abf281fb4
Branch: default
Author: Pekka Klärck
Date: Fri Sep 14 13:35:59 2012
Log: hopefully fixed bytestring related tests on ipy. would be easier
if i would have ipy locally and didn't need to wait for ci to run these
tests...
http://code.google.com/p/robotframework/source/detail?r=283abf281fb4
Modified:
/atest/testdata/core/expbytevalues.py
=======================================
--- /atest/testdata/core/expbytevalues.py Fri Sep 14 02:17:52 2012
+++ /atest/testdata/core/expbytevalues.py Fri Sep 14 13:35:59 2012
@@ -8,9 +8,9 @@
'exp_error_msg': 'hyv\\xe4',
'exp_log_msg': '\\xe4ity'}
else:
- messages = {'exp_return_msg': 'ty\xf6paikka',
- 'exp_error_msg': 'hyv\xe4',
- 'exp_log_msg': '\xe4ity'}
+ messages = {'exp_return_msg': u'ty\xf6paikka',
+ 'exp_error_msg': u'hyv\xe4',
+ 'exp_log_msg': u'\xe4ity'}
return dict(messages, exp_return_value='ty\xf6paikka')
==============================================================================
Revision: 68f7958a06ac
Branch: default
Author: Pekka Klärck
Date: Fri Sep 14 13:52:35 2012
Log: cleaned up tests related to trace logging non-ascii return
values. now they may pass also with ipy.
http://code.google.com/p/robotframework/source/detail?r=68f7958a06ac
Modified:
/atest/robot/keywords/trace_log_return_value.txt
=======================================
--- /atest/robot/keywords/trace_log_return_value.txt Wed Apr 20 05:35:52
2011
+++ /atest/robot/keywords/trace_log_return_value.txt Fri Sep 14 13:52:35
2012
@@ -1,7 +1,6 @@
*** Settings ***
Suite Setup Run Tests --loglevel TRACE
keywords/trace_log_return_value.txt
-Force Tags regression
-Default Tags pybot jybot
+Force Tags regression pybot jybot
Resource atest_resource.txt
*** Test Cases ***
@@ -36,17 +35,16 @@
${test} = Check Test Case ${TESTNAME}
Check Log Message ${test.kws[0].msgs[2]} Return: u'Circle is
360\\xb0, Hyv\\xe4\\xe4 \\xfc\\xf6t\\xe4, \\u0989\\u09c4 \\u09f0 \\u09fa
\\u099f \\u09eb \\u09ea \\u09b9' TRACE
-Return Object with Invalid Unicode Repr with Python
- [Tags] pybot
- ${test} = Check Test Case Return Object with Invalid Unicode Repr
- Check Log Message ${test.kws[0].msgs[1]} Return: u'Hyv\\xe4' TRACE
-
-Return Object with Invalid Unicode Repr with Jython
- [Tags] jybot
- ${test} = Check Test Case Return Object with Invalid Unicode Repr
- Comment Next value is invalid , but that is the value Jython 2.5.1
returns
- Check Log Message ${test.kws[0].msgs[1]} Return: Hyvä TRACE
+Return Object with Invalid Unicode Repr
+ [Documentation] How the return value is logged depends on the
interpreter.
+ ${test} = Check Test Case ${TESTNAME}
+ ${path} ${base} = Split Path ${INTERPRETER}
+ ${ret} = Set Variable If 'python' in '${base}' u'Hyv\\xe4'
Hyvä
+ Check Log Message ${test.kws[0].msgs[1]} Return: ${ret} TRACE
Return Object with Non Ascii String from Repr
- ${test} = Check Test Case ${TESTNAME}
- Check Log Message ${test.kws[0].msgs[1]} Return: Hyv\\xe4 TRACE
+ [Documentation] How the return value is logged depends on the
interpreter.
+ ${test} = Check Test Case ${TESTNAME}
+ ${path} ${base} = Split Path ${INTERPRETER}
+ ${ret} = Set Variable If 'ipy' in '${base}' Hyvä Hyv\\xe4
+ Check Log Message ${test.kws[0].msgs[1]} Return: ${ret} TRACE
==============================================================================
Revision: 45566b8f4160
Branch: default
Author: Pekka Klärck
Date: Fri Sep 14 14:02:26 2012
Log: updated libdoc's non-ASCII test hopefully to work with ipy
http://code.google.com/p/robotframework/source/detail?r=45566b8f4160
Modified:
/atest/robot/libdoc/module_library.txt
=======================================
--- /atest/robot/libdoc/module_library.txt Tue Feb 14 03:59:52 2012
+++ /atest/robot/libdoc/module_library.txt Fri Sep 14 14:02:26 2012
@@ -40,7 +40,12 @@
Keyword Doc Should Start With 0 Get the intialization variables
Keyword Doc Should Be 1 A keyword\n\nSee `get hello` for details
-Non ASCII
+Valid non-ASCII
Keyword Doc Should Be 2 Hyvää yötä.\n\nСпасибо!
- Keyword Doc Should Be 3 Hyv\\xe4\\xe4 y\\xf6t\\xe4.
Keyword Doc Should Be 4 Hyvää yötä.
+
+Invalid non-ASCII
+ ${path} ${base} = Split Path ${INTERPRETER}
+ ${expected} = Set Variable If 'ipy' not in '${base}'
+ ... Hyv\\xe4\\xe4 y\\xf6t\\xe4. Hyvää yötä.
+ Keyword Doc Should Be 3 ${expected}
==============================================================================
Revision: f2385f892862
Branch: default
Author: Pekka Klärck
Date: Fri Sep 14 14:09:02 2012
Log: hopefully fixed non-ASCII variable tests with ipy
http://code.google.com/p/robotframework/source/detail?r=f2385f892862
Modified:
/atest/testdata/variables/non_string_variables.py
=======================================
--- /atest/testdata/variables/non_string_variables.py Fri Sep 14 03:39:48
2012
+++ /atest/testdata/variables/non_string_variables.py Fri Sep 14 14:09:02
2012
@@ -3,21 +3,27 @@
def get_variables(interpreter=None):
- return {'integer': 42,
- 'float': 3.14,
- 'byte_string': 'hyv\xe4',
- 'byte_string_str': _byte_string_str(interpreter),
- 'boolean': True,
- 'none': None,
- 'module': sys,
- 'module_str': str(sys),
- 'list': [1, '\xe4', u'\xe4'],
- 'list_str': "[1, '\\xe4', u'\\xe4']",
- 'dict': {'\xe4': u'\xe4'},
- 'dict_str': "{'\\xe4': u'\\xe4'}"}
+ variables = {'integer': 42,
+ 'float': 3.14,
+ 'byte_string': 'hyv\xe4',
+ 'boolean': True,
+ 'none': None,
+ 'module': sys,
+ 'module_str': str(sys),
+ 'list': [1, '\xe4', u'\xe4'],
+ 'dict': {'\xe4': u'\xe4'}}
+ variables.update(_get_interpreter_specific_strs(interpreter))
+ return variables
-def _byte_string_str(interpreter):
- return 'hyv\\xe4' if not _running_on_iron_python(interpreter)
else 'hyv\xe4'
+def _get_interpreter_specific_strs(interpreter):
+ if not _running_on_iron_python(interpreter):
+ return {'byte_string_str': 'hyv\\xe4',
+ 'list_str': "[1, '\\xe4', u'\\xe4']",
+ 'dict_str': "{'\\xe4': u'\\xe4'}"}
+ else:
+ return {'byte_string_str': u'hyv\xe4',
+ 'list_str': "[1, u'\\xe4', u'\\xe4']",
+ 'dict_str': "{u'\\xe4': u'\\xe4'}"}
def _running_on_iron_python(interpreter):
if interpreter:
