3 new revisions:
Revision: 3c2aacce7a2c
Author: Janne Härkönen <[email protected]>
Date: Mon Nov 28 04:07:27 2011
Log: use new xml parsing also with p/jybot
http://code.google.com/p/robotframework/source/detail?r=3c2aacce7a2c
Revision: bba9a19ddf34
Author: Janne Härkönen <[email protected]>
Date: Mon Nov 28 04:16:17 2011
Log: create result configuration in RebotSettings
http://code.google.com/p/robotframework/source/detail?r=bba9a19ddf34
Revision: a3498c414cb5
Author: Janne Härkönen <[email protected]>
Date: Mon Nov 28 04:16:22 2011
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=a3498c414cb5
==============================================================================
Revision: 3c2aacce7a2c
Author: Janne Härkönen <[email protected]>
Date: Mon Nov 28 04:07:27 2011
Log: use new xml parsing also with p/jybot
http://code.google.com/p/robotframework/source/detail?r=3c2aacce7a2c
Modified:
/src/robot/reporting/resultwriter.py
=======================================
--- /src/robot/reporting/resultwriter.py Wed Nov 16 02:04:47 2011
+++ /src/robot/reporting/resultwriter.py Mon Nov 28 04:07:27 2011
@@ -23,7 +23,6 @@
from robot.reporting.xunitwriter import XUnitWriter
from robot.reporting.builders import LogBuilder, ReportBuilder,
XUnitBuilder, OutputBuilder
-from robot.reporting.outputparser import OutputParser
class _ResultWriter(object):
@@ -34,6 +33,16 @@
self._data_model = None
self._data_sources = []
+ @property
+ def data_model(self):
+ if self._data_model is None:
+ creator = JSModelCreator(self.result_from_xml.result,
+ log_path=self.settings['Log'],
+ split_log=self.settings['SplitLog'])
+ self.result.visit(CombiningVisitor(creator,
KeywordRemovingVisitor()))
+ self._data_model = DataModelWriter(creator.datamodel,
creator.split_results)
+ return self._data_model
+
@property
def result_from_xml(self):
if self._xml_result is None:
@@ -66,13 +75,6 @@
class RobotResultWriter(_ResultWriter):
- @property
- def data_model(self):
- if self._data_model is None:
- parser = OutputParser(self.settings['Log'],
self.settings['SplitLog'])
- self._data_model = parser.parse(self._data_sources[0])
- return self._data_model
-
def write_results(self, data_source):
self._data_sources = [data_source]
LogBuilder(self).build()
@@ -90,16 +92,6 @@
ReportBuilder(self).build()
return self.result_from_xml.result
- @property
- def data_model(self):
- if self._data_model is None:
- creator = JSModelCreator(self.result_from_xml.result,
- log_path=self.settings['Log'],
- split_log=self.settings['SplitLog'])
- self.result.visit(CombiningVisitor(creator,
KeywordRemovingVisitor()))
- self._data_model = DataModelWriter(creator.datamodel,
creator.split_results)
- return self._data_model
-
class ResultFromXML(object):
==============================================================================
Revision: bba9a19ddf34
Author: Janne Härkönen <[email protected]>
Date: Mon Nov 28 04:16:17 2011
Log: create result configuration in RebotSettings
http://code.google.com/p/robotframework/source/detail?r=bba9a19ddf34
Modified:
/src/robot/conf/settings.py
/src/robot/reporting/resultwriter.py
=======================================
--- /src/robot/conf/settings.py Fri Nov 11 00:35:57 2011
+++ /src/robot/conf/settings.py Mon Nov 28 04:16:17 2011
@@ -282,3 +282,22 @@
def _escape(self, value):
return value
+
+ def result_configuration(self):
+ opts = dict((opt, self[setting]) for opt, setting in
+ [('name', 'Name'),
+ ('doc', 'Doc'),
+ ('metadata', 'Metadata'),
+ ('set_tags', 'SetTag'),
+ ('include_tags', 'Include'),
+ ('exclude_tags', 'Exclude'),
+ ('include_suites', 'SuiteNames'),
+ ('include_tests', 'TestNames'),
+ ('remove_keywords', 'RemoveKeywords'),
+ ('log_level', 'LogLevel'),
+ ('critical', 'Critical'),
+ ('noncritical', 'NonCritical'),
+ ('starttime', 'StartTime'),
+ ('endtime', 'EndTime')])
+ opts['metadata'] = dict(opts['metadata'])
+ return opts
=======================================
--- /src/robot/reporting/resultwriter.py Mon Nov 28 04:07:27 2011
+++ /src/robot/reporting/resultwriter.py Mon Nov 28 04:16:17 2011
@@ -49,7 +49,7 @@
#TODO: RFX and ResultFromXML name conflict
execution_result = RFX(*self._data_sources)
execution_result.configure(status_rc=not
self.settings['NoStatusRC'],
- **self._create_opts())
+
**self.settings.result_configuration())
self._xml_result = ResultFromXML(execution_result,
self.settings)
return self._xml_result
@@ -57,21 +57,6 @@
def result(self):
return self._xml_result.result
- def _create_opts(self):
- opts = {}
- for opt_name, settings_name in [
- ('name', 'Name'), ('doc', 'Doc'), ('metadata', 'Metadata'),
- ('set_tags', 'SetTag'), ('include_tags', 'Include'),
- ('exclude_tags', 'Exclude'), ('include_suites', 'SuiteNames'),
- ('include_tests', 'TestNames'),
('remove_keywords', 'RemoveKeywords'),
- ('log_level', 'LogLevel'), ('critical', 'Critical'),
- ('noncritical', 'NonCritical'), ('starttime', 'StartTime'),
- ('endtime', 'EndTime')
- ]:
- opts[opt_name] = self.settings[settings_name]
- opts['metadata'] = dict(opts['metadata'])
- return opts
-
class RobotResultWriter(_ResultWriter):
==============================================================================
Revision: a3498c414cb5
Author: Janne Härkönen <[email protected]>
Date: Mon Nov 28 04:16:22 2011
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=a3498c414cb5
