4 new revisions:
Revision: e769bb5b093e
Author: Mikko Korpela <[email protected]>
Date: Wed Nov 9 06:57:03 2011
Log: Fix output writing in new model
http://code.google.com/p/robotframework/source/detail?r=e769bb5b093e
Revision: 1445f11c6e0b
Author: Mikko Korpela <[email protected]>
Date: Wed Nov 9 07:01:35 2011
Log: Make rebot output regexp weaker to allow Python 2.7.2+ and similar
http://code.google.com/p/robotframework/source/detail?r=1445f11c6e0b
Revision: 4bad28b847ad
Author: Mikko Korpela <[email protected]>
Date: Wed Nov 9 07:03:33 2011
Log: Make pybot output regexp weaker to allow Python 2.7.2+ and similar
http://code.google.com/p/robotframework/source/detail?r=4bad28b847ad
Revision: df061291e463
Author: Mikko Korpela <[email protected]>
Date: Wed Nov 9 07:41:03 2011
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=df061291e463
==============================================================================
Revision: e769bb5b093e
Author: Mikko Korpela <[email protected]>
Date: Wed Nov 9 06:57:03 2011
Log: Fix output writing in new model
http://code.google.com/p/robotframework/source/detail?r=e769bb5b093e
Modified:
/src/robot/reporting/resultwriter.py
=======================================
--- /src/robot/reporting/resultwriter.py Wed Nov 9 05:48:14 2011
+++ /src/robot/reporting/resultwriter.py Wed Nov 9 06:57:03 2011
@@ -15,7 +15,9 @@
from robot.common import Statistics
from robot.errors import DataError
from robot.output import LOGGER
+from robot.reporting.jsondatamodel import DataModelWriter
from robot.result.builders import ResultFromXML as RFX
+from robot.result.datamodel import DatamodelVisitor
from robot.result.serializer import RebotXMLWriter
from robot import utils
@@ -74,9 +76,14 @@
def write_rebot_results(self, *data_sources):
self._data_sources = data_sources
- builder = OutputBuilder(self)
- self.write_robot_results(builder.build())
- builder.finalize()
+ self.result_from_xml
+ if self.settings['Output']:
+ OutputBuilder(self).build()
+ visitor = DatamodelVisitor(self._execution_result,
+ log_path=self.settings['Log'],
+ split_log=self.settings['SplitLog'])
+ self._data_model = DataModelWriter(visitor.datamodel)
+ self.write_robot_results(None)
return self._execution_result
==============================================================================
Revision: 1445f11c6e0b
Author: Mikko Korpela <[email protected]>
Date: Wed Nov 9 07:01:35 2011
Log: Make rebot output regexp weaker to allow Python 2.7.2+ and similar
http://code.google.com/p/robotframework/source/detail?r=1445f11c6e0b
Modified:
/atest/robot/cli/rebot/help_and_version.txt
=======================================
--- /atest/robot/cli/rebot/help_and_version.txt Sun Sep 19 00:44:32 2010
+++ /atest/robot/cli/rebot/help_and_version.txt Wed Nov 9 07:01:35 2011
@@ -25,5 +25,5 @@
${rc} ${output} = Run And Return Rc And Output ${REBOT} --version
2>&1
Should Be Equal ${rc} ${251}
Log ${output}
- Should Match Regexp ${output} ^Rebot (2\\.\\d+(\\.\\d+)?( (alpha|
beta|rc)\\d*)?|trunk 20\\d{6}) \\([PJ]ython 2\\.[\\d.]+((a|b|rc)\\d)?
on .+\\)$
+ Should Match Regexp ${output} ^Rebot (2\\.\\d+(\\.\\d+)?( (alpha|
beta|rc)\\d*)?|trunk 20\\d{6}) \\([PJ]ython 2\\.[\\d.]+.+ on .+\\)$
Should Be True len("${output}") < 80 Too long version line
==============================================================================
Revision: 4bad28b847ad
Author: Mikko Korpela <[email protected]>
Date: Wed Nov 9 07:03:33 2011
Log: Make pybot output regexp weaker to allow Python 2.7.2+ and similar
http://code.google.com/p/robotframework/source/detail?r=4bad28b847ad
Modified:
/atest/robot/cli/runner/help_and_version.txt
=======================================
--- /atest/robot/cli/runner/help_and_version.txt Sun Sep 19 00:44:32 2010
+++ /atest/robot/cli/runner/help_and_version.txt Wed Nov 9 07:03:33 2011
@@ -29,5 +29,5 @@
${rc} ${output} = Run And Return Rc And Output ${ROBOT} --version
Should Be Equal ${rc} ${251}
Log ${output}
- Should Match Regexp ${output} ^Robot Framework (2\\.\\d+(\\.\\d+)?(
(alpha|beta|rc)\\d*)?|trunk 20\\d{6}) \\([PJ]ython 2\\.[\\d.]+((a|b|
rc)\\d)? on .+\\)$
+ Should Match Regexp ${output} ^Robot Framework (2\\.\\d+(\\.\\d+)?(
(alpha|beta|rc)\\d*)?|trunk 20\\d{6}) \\([PJ]ython 2\\.[\\d.]+.+ on .+\\)$
Should Be True len("${output}") < 80 Too long version line
==============================================================================
Revision: df061291e463
Author: Mikko Korpela <[email protected]>
Date: Wed Nov 9 07:41:03 2011
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=df061291e463
