4 new revisions:
Revision: 33026af6a9ce
Author: Janne Härkönen <j...@reaktor.fi>
Date: Wed Jun 15 04:29:13 2011
Log: return rebot datasource without wrapping it in a list
http://code.google.com/p/robotframework/source/detail?r=33026af6a9ce
Revision: 131fc1502d1a
Author: Janne Härkönen <j...@reaktor.fi>
Date: Wed Jun 15 04:29:44 2011
Log: removed code related to splitting
http://code.google.com/p/robotframework/source/detail?r=131fc1502d1a
Revision: 06a78de0fdce
Author: Janne Härkönen <j...@reaktor.fi>
Date: Wed Jun 15 04:30:11 2011
Log: API was changed after serializers were removed
http://code.google.com/p/robotframework/source/detail?r=06a78de0fdce
Revision: 51bb70a3862b
Author: Janne Härkönen <j...@reaktor.fi>
Date: Wed Jun 15 04:30:30 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=51bb70a3862b
==============================================================================
Revision: 33026af6a9ce
Author: Janne Härkönen <j...@reaktor.fi>
Date: Wed Jun 15 04:29:13 2011
Log: return rebot datasource without wrapping it in a list
http://code.google.com/p/robotframework/source/detail?r=33026af6a9ce
Modified:
/src/robot/__init__.py
/src/robot/conf/settings.py
=======================================
--- /src/robot/__init__.py Wed Jun 15 04:07:06 2011
+++ /src/robot/__init__.py Wed Jun 15 04:29:13 2011
@@ -128,8 +128,8 @@
% suite.get_stat_message())
output.close(suite)
if settings.is_rebot_needed():
- _, settings = settings.get_rebot_datasources_and_settings()
- Reporter(settings).execute(settings['Output'])
+ output, settings = settings.get_rebot_datasource_and_settings()
+ Reporter(settings).execute(output)
LOGGER.close()
return suite
=======================================
--- /src/robot/conf/settings.py Tue Jun 14 16:07:44 2011
+++ /src/robot/conf/settings.py Wed Jun 15 04:29:13 2011
@@ -200,8 +200,8 @@
def is_rebot_needed(self):
return not ('NONE' == self['Log'] == self['Report'] ==
self['Summary'] == self['XUnitFile'])
- def get_rebot_datasources_and_settings(self):
- datasources = [self['Output']]
+ def get_rebot_datasource_and_settings(self):
+ datasource = self['Output']
settings = RebotSettings(log=False)
settings._opts.update(self._opts)
for name in ['Variables', 'VariableFiles', 'Listeners']:
@@ -213,7 +213,7 @@
for name in ['Name', 'Doc']:
settings._opts[name] = None
settings._opts['LogLevel'] = 'TRACE'
- return datasources, settings
+ return datasource, settings
def _outputfile_disabled(self, type_, name):
if name == 'NONE':
==============================================================================
Revision: 131fc1502d1a
Author: Janne Härkönen <j...@reaktor.fi>
Date: Wed Jun 15 04:29:44 2011
Log: removed code related to splitting
http://code.google.com/p/robotframework/source/detail?r=131fc1502d1a
Modified:
/src/robot/serializing/testoutput.py
=======================================
--- /src/robot/serializing/testoutput.py Wed Jun 15 04:07:06 2011
+++ /src/robot/serializing/testoutput.py Wed Jun 15 04:29:44 2011
@@ -141,7 +141,7 @@
def serialize(self, settings, generator='Robot', output=None):
self._generator = generator
- self.serialize_output(settings['Output'], settings['SplitOutputs'])
+ self.serialize_output(settings['Output'])
self.serialize_summary(settings['Summary'],
settings['SummaryTitle'],
settings['ReportBackground'])
datamodel = jsparser.create_datamodel_from(output)
@@ -151,10 +151,10 @@
LOGGER.output_file('Log', settings['Log'])
self.serialize_xunit(settings['XUnitFile'])
- def serialize_output(self, path, split=-1, log=True):
+ def serialize_output(self, path, log=True):
if path == 'NONE':
return
- serializer = OutputSerializer(path, split)
+ serializer = OutputSerializer(path)
self.suite.serialize(serializer)
self.statistics.serialize(serializer)
self.exec_errors.serialize(serializer)
==============================================================================
Revision: 06a78de0fdce
Author: Janne Härkönen <j...@reaktor.fi>
Date: Wed Jun 15 04:30:11 2011
Log: API was changed after serializers were removed
http://code.google.com/p/robotframework/source/detail?r=06a78de0fdce
Modified:
/src/robot/output/readers.py
/src/robot/serializing/outputserializers.py
=======================================
--- /src/robot/output/readers.py Wed Jun 15 04:01:03 2011
+++ /src/robot/output/readers.py Wed Jun 15 04:30:11 2011
@@ -327,10 +327,10 @@
self.messages = [MessageFromXml(msg) for msg in
node.findall('msg')]
def serialize(self, serializer):
- serializer.start_errors(self)
+ serializer.start_errors()
for msg in self.messages:
msg.serialize(serializer)
- serializer.end_errors(self)
+ serializer.end_errors()
class CombinedExecutionErrors(ExecutionErrors):
=======================================
--- /src/robot/serializing/outputserializers.py Wed Jun 15 04:01:03 2011
+++ /src/robot/serializing/outputserializers.py Wed Jun 15 04:30:11 2011
@@ -23,8 +23,3 @@
def message(self, msg):
self._write_message(msg)
- def start_errors(self, errors):
- XmlLogger.start_errors(self)
-
- def end_errors(self, errors):
- XmlLogger.end_errors(self)
==============================================================================
Revision: 51bb70a3862b
Author: Janne Härkönen <j...@reaktor.fi>
Date: Wed Jun 15 04:30:30 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=51bb70a3862b
