3 new revisions:
Revision: b8ae7e0b5ed2
Branch: default
Author: Pekka Klärck
Date: Tue Sep 18 14:56:30 2012
Log: Made listener import failure tests independent on actual Python
error ...
http://code.google.com/p/robotframework/source/detail?r=b8ae7e0b5ed2
Revision: 759dec3b08b6
Branch: default
Author: Pekka Klärck
Date: Tue Sep 18 15:10:11 2012
Log: BuiltIn/byte string tests: Use variables containing tested bytes
also ...
http://code.google.com/p/robotframework/source/detail?r=759dec3b08b6
Revision: 0cd37c847a6a
Branch: default
Author: Pekka Klärck
Date: Tue Sep 18 15:34:29 2012
Log: atests: Pass ${PYTHON/JYTHON/IRONPYTHON} variables to runner to
ease d...
http://code.google.com/p/robotframework/source/detail?r=0cd37c847a6a
==============================================================================
Revision: b8ae7e0b5ed2
Branch: default
Author: Pekka Klärck
Date: Tue Sep 18 14:56:30 2012
Log: Made listener import failure tests independent on actual Python
error message. Ought to make these tests pass also with IPY.
http://code.google.com/p/robotframework/source/detail?r=b8ae7e0b5ed2
Modified:
/atest/robot/output/listener_interface/importing_listeners.txt
/atest/robot/output/listener_interface/old_importing_listeners.txt
=======================================
--- /atest/robot/output/listener_interface/importing_listeners.txt Wed Sep
12 15:17:39 2012
+++ /atest/robot/output/listener_interface/importing_listeners.txt Tue Sep
18 14:56:30 2012
@@ -29,12 +29,10 @@
[Template] Check Syslog Contains
Taking listener 'listeners.WithArgs' into use failed:
... Importing listener 'listeners.WithArgs' failed:
- ... Creating instance failed:
- ... TypeError: __init__() takes at least 2 arguments (1
given)${EMPTY TB}
+ ... Creating instance failed: TypeError:
Taking listener 'listeners.WithArgs:1:2:3' into use failed:
... Importing listener 'listeners.WithArgs' failed:
- ... Creating instance failed:
- ... TypeError: __init__() takes at most 3 arguments (4
given)${EMPTY TB}
+ ... Creating instance failed: TypeError:
Non Existing Listener
[Template] Check Syslog Contains
=======================================
--- /atest/robot/output/listener_interface/old_importing_listeners.txt Wed
Sep 12 15:17:39 2012
+++ /atest/robot/output/listener_interface/old_importing_listeners.txt Tue
Sep 18 14:56:30 2012
@@ -29,12 +29,10 @@
[Template] Check Syslog contains
Taking listener 'old_listeners.WithArgs' into use failed:
... Importing listener 'old_listeners.WithArgs' failed:
- ... Creating instance failed:
- ... TypeError: __init__() takes at least 2 arguments (1
given)${EMPTY TB}
+ ... Creating instance failed: TypeError:
Taking listener 'old_listeners.WithArgs:1:2:3' into use failed:
... Importing listener 'old_listeners.WithArgs' failed:
- ... Creating instance failed:
- ... TypeError: __init__() takes at most 3 arguments (4
given)${EMPTY TB}
+ ... Creating instance failed: TypeError:
Non Existing Listener
[Template] Check Syslog contains
==============================================================================
Revision: 759dec3b08b6
Branch: default
Author: Pekka Klärck
Date: Tue Sep 18 15:10:11 2012
Log: BuiltIn/byte string tests: Use variables containing tested bytes
also in expected errors. This way tests hopefully pass also with IPY (where
those bytes actually are Unicode).
http://code.google.com/p/robotframework/source/detail?r=759dec3b08b6
Modified:
/atest/testdata/standard_libraries/builtin/verify.txt
=======================================
--- /atest/testdata/standard_libraries/builtin/verify.txt Mon Sep 3
06:31:01 2012
+++ /atest/testdata/standard_libraries/builtin/verify.txt Tue Sep 18
15:10:11 2012
@@ -48,7 +48,7 @@
${STR1} 1
Should Not Be Equal with bytes containing non-ascii characters
- [Documentation] FAIL \\xe4 == \\xe4
+ [Documentation] FAIL ${BYTES WITH NON ASCII} == ${BYTES WITH NON
ASCII}
Should Not Be Equal ${BYTES WITH NON ASCII} ${BYTES WITHOUT NON
ASCII}
Should Not Be Equal ${BYTES WITH NON ASCII} unicode
Should Not Be Equal ${BYTES WITH NON ASCII} ${BYTES WITH NON ASCII}
@@ -62,12 +62,12 @@
A B Error message
Should Be Equal with bytes containing non-ascii characters
- [Documentation] FAIL \\xe4 != hyva
+ [Documentation] FAIL ${BYTES WITH NON ASCII} != ${BYTES WITHOUT NON
ASCII}
Should be equal ${BYTES WITH NON ASCII} ${BYTES WITH NON ASCII}
Should be equal ${BYTES WITH NON ASCII} ${BYTES WITHOUT NON ASCII}
Should Be Equal with unicode and bytes with non-ascii characters
- [Documentation] FAIL \\xe4 != this fails
+ [Documentation] FAIL ${BYTES WITH NON ASCII} != this fails
Should be equal ${BYTES WITHOUT NON ASCII} hyva
Should be equal ${BYTES WITH NON ASCII} this fails
@@ -222,7 +222,7 @@
Should Match NOK OK Failure
Should Match with bytes containing non-ascii characters
- [Documentation] FAIL '\\xe4' does not match 'aaappaa'
+ [Documentation] FAIL '${BYTES WITH NON ASCII}' does not
match 'aaappaa'
Should match ${BYTES WITH NON ASCII} aaappaa
Should Not Match Regexp
@@ -237,7 +237,7 @@
Should Match Regexp ${EMPTY} whatever Something failed No values
Should Match Regexp with bytes containing non-ascii characters
- [Documentation] FAIL '\\xe4' does not match 'aappaa'
+ [Documentation] FAIL '${BYTES WITH NON ASCII}' does not
match 'aappaa'
Should Match Regexp ${BYTES WITH NON ASCII} aappaa
Should Match Regexp Returns Match And Groups
==============================================================================
Revision: 0cd37c847a6a
Branch: default
Author: Pekka Klärck
Date: Tue Sep 18 15:34:29 2012
Log: atests: Pass ${PYTHON/JYTHON/IRONPYTHON} variables to runner to
ease detecting which interpreter is in use. Took ${IRONPYTHON} into use
with some BuiltIn tests.
http://code.google.com/p/robotframework/source/detail?r=0cd37c847a6a
Modified:
/atest/robot/standard_libraries/builtin/used_in_custom_libs_and_listeners.txt
/atest/robot/standard_libraries/builtin/verify.txt
/atest/run_atests.py
=======================================
---
/atest/robot/standard_libraries/builtin/used_in_custom_libs_and_listeners.txt
Fri Jun 15 03:53:10 2012
+++
/atest/robot/standard_libraries/builtin/used_in_custom_libs_and_listeners.txt
Tue Sep 18 15:34:29 2012
@@ -19,4 +19,5 @@
Use 'Run Keyword' with non-Unicode values
${tc} = Check Test Case ${TESTNAME}
Check Log Message ${tc.kws[0].kws[0].msgs[0]} 42
- Check Log Message ${tc.kws[0].kws[1].msgs[0]} \\xff
+ ${expected} = Set Variable If not "${IRONPYTHON}" \\xff ÿ
+ Check Log Message ${tc.kws[0].kws[1].msgs[0]} ${expected}
=======================================
--- /atest/robot/standard_libraries/builtin/verify.txt Mon Sep 3 06:31:01
2012
+++ /atest/robot/standard_libraries/builtin/verify.txt Tue Sep 18 15:34:29
2012
@@ -229,4 +229,12 @@
Verify argument type message
[Arguments] ${msg} ${type1} ${type2}
+ ${type1} = Str Type to Unicode On IronPython ${type1}
+ ${type2} = Str Type to Unicode On IronPython ${type2}
Check log message ${msg} Argument types
are:\n<type '${type1}'>\n<type '${type2}'>
+
+Str Type to Unicode On IronPython
+ [Arguments] ${type}
+ ${type} = Set Variable If "${IRONPYTHON}" and "${type}" == "str"
+ ... unicode ${type}
+ [Return] ${type}
=======================================
--- /atest/run_atests.py Thu Sep 13 07:03:51 2012
+++ /atest/run_atests.py Tue Sep 18 15:34:29 2012
@@ -38,6 +38,9 @@
--metadata Interpreter:%(INTERPRETER)s
--metadata Platform:%(PLATFORM)s
--variable INTERPRETER:%(INTERPRETER)s
+--variable PYTHON:%(PYTHON)s
+--variable JYTHON:%(JYTHON)s
+--variable IRONPYTHON:%(IRONPYTHON)s
--variable STANDALONE_JYTHON:NO
--pythonpath %(PYTHONPATH)s
--include %(INCLUDE)s
@@ -60,18 +63,22 @@
'''.strip().split())
-def atests(interpreter, *params):
+def atests(interpreter_path, *params):
+ interpreter = splitext(basename(interpreter_path))[0]
resultdir, tempdir = _get_result_and_temp_dirs(interpreter)
args = ARGUMENTS % {
'PYTHONPATH' : join(CURDIR, 'resources'),
'OUTPUTDIR' : resultdir,
- 'INTERPRETER': interpreter,
+ 'INTERPRETER': interpreter_path,
+ 'PYTHON': interpreter_path if 'python' in interpreter else '',
+ 'JYTHON': interpreter_path if 'jython' in interpreter else '',
+ 'IRONPYTHON': interpreter_path if 'ipy' in interpreter else '',
'PLATFORM': sys.platform,
- 'INCLUDE': 'jybot' if 'jython' in basename(interpreter)
else 'pybot'
+ 'INCLUDE': 'jybot' if 'jython' in interpreter else 'pybot'
}
if os.name == 'nt':
args += ' --exclude x-exclude-on-windows'
- if sys.platform == 'darwin' and 'python' in basename(interpreter):
+ if sys.platform == 'darwin' and 'python' in interpreter:
args += ' --exclude x-exclude-on-osx-python'
command = '%s %s %s %s' % (sys.executable, RUNNER,
args, ' '.join(params))
environ = dict(os.environ, TEMPDIR=tempdir)
@@ -82,7 +89,6 @@
def _get_result_and_temp_dirs(interpreter):
- interpreter = splitext(basename(interpreter))[0]
resultdir = join(CURDIR, 'results', interpreter)
tempdir = join(tempfile.gettempdir(), 'robottests', interpreter)
if exists(resultdir):
