2 new revisions:
Revision: 02f3b263e61b
Author: Jussi Malinen
Date: Mon Jun 13 01:48:54 2011
Log: reparse the settings and recreate the robot internal model for
each re...
http://code.google.com/p/robotframework/source/detail?r=02f3b263e61b
Revision: 6579cc84c4d6
Author: Jussi Malinen
Date: Mon Jun 13 01:49:35 2011
Log: merge
http://code.google.com/p/robotframework/source/detail?r=6579cc84c4d6
==============================================================================
Revision: 02f3b263e61b
Author: Jussi Malinen
Date: Mon Jun 13 01:48:54 2011
Log: reparse the settings and recreate the robot internal model for
each rebot run
http://code.google.com/p/robotframework/source/detail?r=02f3b263e61b
Modified:
/src/robot/__init__.py
/src/robot/serializing/testoutput.py
/utest/serializing/test_reporting.py
=======================================
--- /src/robot/__init__.py Sat Jun 4 10:52:18 2011
+++ /src/robot/__init__.py Mon Jun 13 01:48:54 2011
@@ -155,7 +155,7 @@
settings = RebotSettings(options)
LOGGER.register_console_logger(colors=settings['MonitorColors'])
LOGGER.disable_message_cache()
- Reporter().execute(settings, *datasources)
+ Reporter().execute_rebot(settings, *datasources)
LOGGER.close()
class RebotSuite(object):
@property
=======================================
--- /src/robot/serializing/testoutput.py Wed Jun 8 04:44:13 2011
+++ /src/robot/serializing/testoutput.py Mon Jun 13 01:48:54 2011
@@ -69,10 +69,11 @@
self._robot_test_output(data_sources,
settings).serialize_output(output_file)
return [output_file]
+ def execute_rebot(self, settings, *data_sources):
+ data_sources = self._combine_outputs(data_sources, settings)
+ self.execute(settings, *data_sources)
def execute(self, settings, *data_sources):
- if len(data_sources) > 1:
- data_sources = self._combine_outputs(data_sources, settings)
data_model = jsparser.create_datamodel_from(data_sources[0])
report_path = self._parse_file(settings['Report'])
log_path = self._parse_file(settings['Log'])
=======================================
--- /utest/serializing/test_reporting.py Fri Jun 3 03:42:48 2011
+++ /utest/serializing/test_reporting.py Mon Jun 13 01:48:54 2011
@@ -101,7 +101,7 @@
def test_multiple_outputs(self):
self._settings['Log'] = 'log.html'
self._settings['Report'] = 'report.html'
- self._reporter.execute(self._settings, *[resources.GOLDEN_OUTPUT,
resources.GOLDEN_OUTPUT2])
+ self._reporter.execute_rebot(self._settings,
*[resources.GOLDEN_OUTPUT, resources.GOLDEN_OUTPUT2])
self._assert_expected_log('log.html')
self._assert_expected_report('report.html')
==============================================================================
Revision: 6579cc84c4d6
Author: Jussi Malinen
Date: Mon Jun 13 01:49:35 2011
Log: merge
http://code.google.com/p/robotframework/source/detail?r=6579cc84c4d6
