5 new revisions:
Revision: 7f66c35e1c6c
Author: Mikko Korpela <[email protected]>
Date: Thu Dec 1 05:25:47 2011
Log: cleanup
http://code.google.com/p/robotframework/source/detail?r=7f66c35e1c6c
Revision: db50591984bc
Author: Mikko Korpela <[email protected]>
Date: Thu Dec 1 05:25:54 2011
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=db50591984bc
Revision: e8661291ac2f
Author: Mikko Korpela <[email protected]>
Date: Thu Dec 1 05:44:17 2011
Log: cleanup
http://code.google.com/p/robotframework/source/detail?r=e8661291ac2f
Revision: 25ebc9c9ac67
Author: Mikko Korpela <[email protected]>
Date: Thu Dec 1 05:44:24 2011
Log: merge
http://code.google.com/p/robotframework/source/detail?r=25ebc9c9ac67
Revision: e02a555ce558
Author: Mikko Korpela <[email protected]>
Date: Thu Dec 1 05:47:38 2011
Log: Settings: better way to allow calling log/report_config when
log/repor...
http://code.google.com/p/robotframework/source/detail?r=e02a555ce558
==============================================================================
Revision: 7f66c35e1c6c
Author: Mikko Korpela <[email protected]>
Date: Thu Dec 1 05:25:47 2011
Log: cleanup
http://code.google.com/p/robotframework/source/detail?r=7f66c35e1c6c
Modified:
/src/robot/reporting/resultwriter.py
=======================================
--- /src/robot/reporting/resultwriter.py Thu Dec 1 04:32:24 2011
+++ /src/robot/reporting/resultwriter.py Thu Dec 1 05:25:47 2011
@@ -37,8 +37,10 @@
LogBuilder(result.js_model).build(settings.log,
settings.log_configuration())
if settings.report:
- ReportBuilder(result.report_model).build(settings.report,
-
settings.report_configuration())
+ result.js_model.remove_errors()
+ result.js_model.remove_keywords()
+ ReportBuilder(result.js_model).build(settings.report,
+
settings.report_configuration())
return result.return_code
@@ -72,13 +74,3 @@
self.model.visit(CombiningVisitor(creator,
KeywordRemovingVisitor()))
self._js_model = creator.datamodel
return self._js_model
-
- @property
- def log_model(self):
- return self.js_model
-
- @property
- def report_model(self):
- self.js_model.remove_errors()
- self.js_model.remove_keywords()
- return self.js_model
==============================================================================
Revision: db50591984bc
Author: Mikko Korpela <[email protected]>
Date: Thu Dec 1 05:25:54 2011
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=db50591984bc
==============================================================================
Revision: e8661291ac2f
Author: Mikko Korpela <[email protected]>
Date: Thu Dec 1 05:44:17 2011
Log: cleanup
http://code.google.com/p/robotframework/source/detail?r=e8661291ac2f
Modified:
/src/robot/reporting/resultwriter.py
=======================================
--- /src/robot/reporting/resultwriter.py Thu Dec 1 05:25:47 2011
+++ /src/robot/reporting/resultwriter.py Thu Dec 1 05:44:17 2011
@@ -29,19 +29,29 @@
def write_results(self, *data_sources):
settings = self._settings
result = Result(settings, data_sources)
- if settings.output:
- OutputBuilder(result.model).build(settings.output)
- if settings.xunit:
- XUnitBuilder(result.model).build(settings.xunit)
- if settings.log:
- LogBuilder(result.js_model).build(settings.log,
- settings.log_configuration())
- if settings.report:
+ self._write_output(result, settings.output)
+ self._write_xunit(result, settings.xunit)
+ self._write_log(result, settings.log, settings.log_configuration())
+ self._write_report(result, settings.report,
settings.report_configuration())
+ return result.return_code
+
+ def _write_output(self, result, output):
+ if output:
+ OutputBuilder(result.model).build(output)
+
+ def _write_xunit(self, result, xunit):
+ if xunit:
+ XUnitBuilder(result.model).build(xunit)
+
+ def _write_log(self, result, log, config):
+ if log:
+ LogBuilder(result.js_model).build(log, config)
+
+ def _write_report(self, result, report, config):
+ if report:
result.js_model.remove_errors()
result.js_model.remove_keywords()
- ReportBuilder(result.js_model).build(settings.report,
-
settings.report_configuration())
- return result.return_code
+ ReportBuilder(result.js_model).build(report, config)
class Result(object):
==============================================================================
Revision: 25ebc9c9ac67
Author: Mikko Korpela <[email protected]>
Date: Thu Dec 1 05:44:24 2011
Log: merge
http://code.google.com/p/robotframework/source/detail?r=25ebc9c9ac67
==============================================================================
Revision: e02a555ce558
Author: Mikko Korpela <[email protected]>
Date: Thu Dec 1 05:47:38 2011
Log: Settings: better way to allow calling log/report_config when
log/report is None
http://code.google.com/p/robotframework/source/detail?r=e02a555ce558
Modified:
/src/robot/conf/settings.py
=======================================
--- /src/robot/conf/settings.py Thu Dec 1 05:35:40 2011
+++ /src/robot/conf/settings.py Thu Dec 1 05:47:38 2011
@@ -336,6 +336,8 @@
self['TagDoc'], self['TagStatLink'])
def log_configuration(self):
+ if not self.log:
+ return {}
return {
'title': self['LogTitle'],
'reportURL': self._url_from_path(self.log, self.report),
@@ -343,6 +345,8 @@
}
def report_configuration(self):
+ if not self.report:
+ return {}
return {
'title': self['ReportTitle'],
'logURL': self._url_from_path(self.report, self.log),
@@ -350,7 +354,7 @@
}
def _url_from_path(self, source, destination):
- if not (source and destination):
+ if not destination:
return None
return utils.get_link_path(destination, os.path.dirname(source))
