2 new revisions:
Revision: 9e68dcb0efd5
Author: Pekka Klärck
Date: Thu Dec 1 06:23:25 2011
Log: cleanup
http://code.google.com/p/robotframework/source/detail?r=9e68dcb0efd5
Revision: 51668dd90b86
Author: Pekka Klärck
Date: Thu Dec 1 06:23:56 2011
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=51668dd90b86
==============================================================================
Revision: 9e68dcb0efd5
Author: Pekka Klärck
Date: Thu Dec 1 06:23:25 2011
Log: cleanup
http://code.google.com/p/robotframework/source/detail?r=9e68dcb0efd5
Modified:
/src/robot/conf/settings.py
/src/robot/reporting/resultwriter.py
/src/robot/result/executionresult.py
=======================================
--- /src/robot/conf/settings.py Thu Dec 1 06:06:57 2011
+++ /src/robot/conf/settings.py Thu Dec 1 06:23:25 2011
@@ -312,7 +312,7 @@
return value
@property
- def result_config(self):
+ def suite_config(self):
return {
'name': self['Name'],
'doc': self['Doc'],
=======================================
--- /src/robot/reporting/resultwriter.py Thu Dec 1 06:06:57 2011
+++ /src/robot/reporting/resultwriter.py Thu Dec 1 06:23:25 2011
@@ -70,10 +70,9 @@
def model(self):
if self._model is None:
self._model = ResultFromXML(*self._data_sources)
- # TODO: configure and configure_statistics really should be
combined somehow
-
self._model.configure_statistics(**self._settings.statistics_config)
- self._model.configure(status_rc=self._settings.status_rc,
- **self._settings.result_config)
+ self._model.configure(self._settings.status_rc,
+ self._settings.suite_config,
+ self._settings.statistics_config)
return self._model
@property
=======================================
--- /src/robot/result/executionresult.py Thu Dec 1 06:06:57 2011
+++ /src/robot/result/executionresult.py Thu Dec 1 06:23:25 2011
@@ -25,26 +25,23 @@
self.suite = TestSuite()
self.errors = ExecutionErrors()
self.generator = None
- self.should_return_status_rc = True
- self._stat_opts = {}
+ self._status_rc = True
+ self._stat_config = {}
@property
def statistics(self):
- return Statistics(self.suite, **self._stat_opts)
+ return Statistics(self.suite, **self._stat_config)
@property
def return_code(self):
- if self.should_return_status_rc:
+ if self._status_rc:
return min(self.suite.statistics.critical.failed, 250)
return 0
- def configure(self, status_rc=True, **suite_opts):
- self.should_return_status_rc = status_rc
- SuiteConfigurer(**suite_opts).configure(self.suite)
-
- # TODO: Combine with configure
- def configure_statistics(self, **stat_opts):
- self._stat_opts = stat_opts
+ def configure(self, status_rc=True, suite_config={}, stat_config={}):
+ SuiteConfigurer(**suite_config).configure(self.suite)
+ self._status_rc = status_rc
+ self._stat_config = stat_config
def visit(self, visitor):
visitor.visit_result(self)
==============================================================================
Revision: 51668dd90b86
Author: Pekka Klärck
Date: Thu Dec 1 06:23:56 2011
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=51668dd90b86
