5 new revisions:
Revision: 9b8dba5cfc80
Author: Pekka Klärck
Date: Thu Dec 1 04:35:16 2011
Log: test error conditions with non-ascii file names
http://code.google.com/p/robotframework/source/detail?r=9b8dba5cfc80
Revision: 60174016021c
Author: Pekka Klärck
Date: Thu Dec 1 04:43:29 2011
Log: XmlSource: Handle non-ascii paths correctly
http://code.google.com/p/robotframework/source/detail?r=60174016021c
Revision: d50228f49fac
Author: Pekka Klärck
Date: Thu Dec 1 04:53:30 2011
Log: fixed xunitwriter after removing suite.all_stats
http://code.google.com/p/robotframework/source/detail?r=d50228f49fac
Revision: fc4a33026e9b
Author: Pekka Klärck
Date: Thu Dec 1 04:58:33 2011
Log: fixed tests after removing suite.all_stats and
suite.critical_stats
http://code.google.com/p/robotframework/source/detail?r=fc4a33026e9b
Revision: 3864883ff6eb
Author: Pekka Klärck
Date: Thu Dec 1 04:58:40 2011
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=3864883ff6eb
==============================================================================
Revision: 9b8dba5cfc80
Author: Pekka Klärck
Date: Thu Dec 1 04:35:16 2011
Log: test error conditions with non-ascii file names
http://code.google.com/p/robotframework/source/detail?r=9b8dba5cfc80
Modified:
/atest/robot/cli/runner/output_files.txt
=======================================
--- /atest/robot/cli/runner/output_files.txt Wed Nov 30 07:03:42 2011
+++ /atest/robot/cli/runner/output_files.txt Thu Dec 1 04:35:16 2011
@@ -50,18 +50,18 @@
Directory Should Contain ${CLI OUTDIR} l-1.js l-2.js l.html
o.xml r.html
Non-writable Output File
- Create Directory ${CLI OUTDIR}/directory.xml
- Run Tests Without Processing Output --output ${CLI
OUTDIR}/directory.xml ${TESTFILE}
- Check Stderr Matches Regexp \\[ ERROR \\] Opening output
file '.*directory.xml' for writing failed: (IOError|
FileNotFoundException): .*${USAGE_TIP}
+ Create Directory ${CLI OUTDIR}/diréctöry.xml
+ Run Tests Without Processing Output --output ${CLI
OUTDIR}/diréctöry.xml ${TESTFILE}
+ Check Stderr Matches Regexp \\[ ERROR \\] Opening output
file '.*diréctöry.xml' for writing failed: (IOError|
FileNotFoundException): .*${USAGE_TIP}
Non-writable Log and Report
- ${directory} = Join Path ${CLI OUTDIR}/dir.html
+ ${directory} = Join Path ${CLI OUTDIR}/diréctöry.html
Create Directory ${directory}
Run Tests --log ${directory} --report ${directory} ${TESTFILE}
Should Be Equal ${SUITE.status} PASS
Check Stderr Matches Regexp SEPARATOR=\n
- ... \\[ ERROR \\] Writing log file '.*dir.html' failed: .*
- ... \\[ ERROR \\] Writing report file '.*dir.html' failed: .*
+ ... \\[ ERROR \\] Writing log file '.*diréctöry.html' failed: .*
+ ... \\[ ERROR \\] Writing report file '.*diréctöry.html' failed: .*
Check Stdout Contains Output:
Check Stdout Does Not Contain Log:
Check Stdout Does Not Contain Report:
==============================================================================
Revision: 60174016021c
Author: Pekka Klärck
Date: Thu Dec 1 04:43:29 2011
Log: XmlSource: Handle non-ascii paths correctly
http://code.google.com/p/robotframework/source/detail?r=60174016021c
Modified:
/atest/robot/cli/rebot/invalid_usage.txt
/src/robot/result/builders.py
/src/robot/utils/xmlsource.py
/utest/utils/test_xmlsource.py
=======================================
--- /atest/robot/cli/rebot/invalid_usage.txt Sun Nov 27 23:53:58 2011
+++ /atest/robot/cli/rebot/invalid_usage.txt Thu Dec 1 04:43:29 2011
@@ -13,7 +13,7 @@
Rebot should fail ${EMPTY} Expected at least 1 argument, got 0.
Non-Existing Input
- Rebot should fail nonex.xml Reading XML source 'nonex\\.xml' failed:
Source file 'nonex\\.xml' does not exist.*
+ Rebot should fail nönéx.xml Reading XML source 'nönéx\\.xml' failed:
Source file 'nönéx\\.xml' does not exist.*
Non-XML Input
Create File ${MYOUTDIR}/invalid.txt Hello, world
@@ -34,9 +34,9 @@
[Teardown] Set Read Write ${MYOUTDIR}${/}x
Invalid Output File
- Create Directory ${MYOUTDIR}${/}directory.ext
- Rebot should fail -d ${MYOUTDIR} -o directory.ext ${MYINPUT}
- ... Opening output file '.*directory.ext' for writing failed:
(IOError|FileNotFoundException): .*
+ Create Directory ${MYOUTDIR}${/}diréctöry.ext
+ Rebot should fail -d ${MYOUTDIR} -o diréctöry.ext ${MYINPUT}
+ ... Opening output file '.*diréctöry.ext' for writing failed:
(IOError|FileNotFoundException): .*
Invalid Argument Values
Run Rebot --suitestatlevel not_int --tagstatlink less_than_3x_:
${MYINPUT}
=======================================
--- /src/robot/result/builders.py Mon Nov 28 05:30:21 2011
+++ /src/robot/result/builders.py Thu Dec 1 04:43:29 2011
@@ -17,8 +17,8 @@
from robot.errors import DataError
from robot.utils import ET, XmlSource
-from executionresult import ExecutionResult, CombinedExecutionResult
-from suiteteardownfailed import SuiteTeardownFailureHandler
+from .executionresult import ExecutionResult, CombinedExecutionResult
+from .suiteteardownfailed import SuiteTeardownFailureHandler
def ResultFromXML(*sources):
@@ -31,7 +31,7 @@
return ExecutionResultBuilder(source).build(ExecutionResult())
except DataError, err:
raise DataError("Reading XML source '%s' failed: %s"
- % (source, unicode(err)))
+ % (unicode(source), unicode(err)))
class ExecutionResultBuilder(object):
=======================================
--- /src/robot/utils/xmlsource.py Sun Nov 27 23:53:58 2011
+++ /src/robot/utils/xmlsource.py Thu Dec 1 04:43:29 2011
@@ -50,5 +50,5 @@
if hasattr(self._source, 'name'):
return self._source.name
if isinstance(self._source, basestring):
- return str(self._source)
+ return self._source
return '<in-memory file>'
=======================================
--- /utest/utils/test_xmlsource.py Tue Nov 29 05:33:18 2011
+++ /utest/utils/test_xmlsource.py Thu Dec 1 04:43:29 2011
@@ -32,9 +32,13 @@
def test_filename_is_validated(self):
def use(src):
- with src as s:
+ with src:
pass
assert_raises(DataError, use, XmlSource('nonex.xml'))
+ def test_non_ascii_string_repr(self):
+ self._verify_string_representation(XmlSource(u'\xe4'), u'\xe4')
+
def _verify_string_representation(self, source, expected):
- assert_equals(str(source), expected)
+ assert_equals(unicode(source), expected)
+ assert_equals('-%s-' % source, '-%s-' % expected)
==============================================================================
Revision: d50228f49fac
Author: Pekka Klärck
Date: Thu Dec 1 04:53:30 2011
Log: fixed xunitwriter after removing suite.all_stats
http://code.google.com/p/robotframework/source/detail?r=d50228f49fac
Modified:
/src/robot/reporting/xunitwriter.py
=======================================
--- /src/robot/reporting/xunitwriter.py Wed Nov 30 05:13:54 2011
+++ /src/robot/reporting/xunitwriter.py Thu Dec 1 04:53:30 2011
@@ -36,9 +36,9 @@
return
self._root_suite = suite
attrs = {'name': suite.name,
- 'tests': suite.all_stats.total,
+ 'tests': suite.statistics.all.total,
'errors': 0,
- 'failures': suite.all_stats.failed,
+ 'failures': suite.statistics.all.failed,
'skip': 0}
self._writer.start('testsuite', attrs)
==============================================================================
Revision: fc4a33026e9b
Author: Pekka Klärck
Date: Thu Dec 1 04:58:33 2011
Log: fixed tests after removing suite.all_stats and
suite.critical_stats
http://code.google.com/p/robotframework/source/detail?r=fc4a33026e9b
Modified:
/atest/robot/rebot/filter_by_names.txt
/atest/robot/standard_libraries/builtin/run_keyword_based_on_suite_stats.html
/atest/robot/tags/include_and_exclude_with_rebot.txt
=======================================
--- /atest/robot/rebot/filter_by_names.txt Thu Nov 3 17:13:41 2011
+++ /atest/robot/rebot/filter_by_names.txt Thu Dec 1 04:58:33 2011
@@ -104,11 +104,11 @@
Run Rebot ${params} ${ESCAPES} ${INPUT FILE}
Stderr Should Be Empty
Check Suite Contains Tests ${SUITE} @{tests}
- Should Be True ${SUITE.all_stats.passed} == len(@{tests})
+ Should Be True ${SUITE.statistics.all.passed} == len(@{tests})
Check Stats
Check Stats
- Should Be True ${SUITE.all_stats.failed} == 0
+ Should Be True ${SUITE.statistics.all.failed} == 0
Should Be Equal ${SUITE.starttime} N/A
Should Be Equal ${SUITE.endtime} N/A
Is Valid Elapsed Time ${SUITE.elapsedtime}
@@ -131,7 +131,7 @@
Run Suites ${params}
Should Contain Suites ${SUITE.suites[0]} ${subsuite}
Check Suite Contains Tests ${SUITE} @{tests}
- Should Be True ${SUITE.all_stats.passed} == len(@{tests})
+ Should Be True ${SUITE.statistics.all.passed} == len(@{tests})
Check Stats
Run Suites
=======================================
---
/atest/robot/standard_libraries/builtin/run_keyword_based_on_suite_stats.html
Mon Apr 12 05:17:10 2010
+++
/atest/robot/standard_libraries/builtin/run_keyword_based_on_suite_stats.html
Thu Dec 1 04:58:33 2011
@@ -1211,7 +1211,7 @@
- <td>Ints Equal</td><td>${suite.critical_stats.failed}</td><td>1</td>
+ <td>Ints
Equal</td><td>${suite.statistics.critical.failed}</td><td>1</td>
@@ -1432,7 +1432,7 @@
<td></td>
- <td>Ints Equal</td><td>${suite.all_stats.failed}</td><td>0</td>
+ <td>Ints Equal</td><td>${suite.statistics.all.failed}</td><td>0</td>
@@ -1649,7 +1649,7 @@
<td></td>
- <td>Ints Equal</td><td>${suite.all_stats.failed}</td><td>1</td>
+ <td>Ints Equal</td><td>${suite.statistics.all.failed}</td><td>1</td>
=======================================
--- /atest/robot/tags/include_and_exclude_with_rebot.txt Thu Nov 3
17:13:41 2011
+++ /atest/robot/tags/include_and_exclude_with_rebot.txt Thu Dec 1
04:58:33 2011
@@ -126,8 +126,8 @@
Run Rebot ${params} ${ESCAPES} ${INPUT FILE}
Stderr Should Be Empty
Check Suite Contains Tests ${SUITE} @{tests}
- Should Be True ${SUITE.all_stats.passed} == len(@{tests})
- Should Be True ${SUITE.all_stats.failed} == 0
+ Should Be True ${SUITE.statistics.all.passed} == len(@{tests})
+ Should Be True ${SUITE.statistics.all.failed} == 0
${exp_start} = Evaluate "${params}" == "" and "${ORIG_START}"
or "N/A"
${exp_end} = Evaluate "${params}" == "" and "${ORIG_END}" or "N/A"
Should Be Equal ${SUITE.starttime} ${exp_start}
==============================================================================
Revision: 3864883ff6eb
Author: Pekka Klärck
Date: Thu Dec 1 04:58:40 2011
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=3864883ff6eb
