Revision: 4600
Author: janne.t.harkonen
Date: Thu Feb 3 04:04:27 2011
Log: settings: --starttime and --endtime exist always
This makes code that handles these options cleaner when
Robot is run and log created straight afterwards.
http://code.google.com/p/robotframework/source/detail?r=4600
Modified:
/trunk/src/robot/conf/settings.py
/trunk/src/robot/output/readers.py
=======================================
--- /trunk/src/robot/conf/settings.py Tue Dec 28 06:02:19 2010
+++ /trunk/src/robot/conf/settings.py Thu Feb 3 04:04:27 2011
@@ -196,18 +196,18 @@
'RunMode' : ('runmode', []),
'WarnOnSkipped' : ('warnonskippedfiles', False),
'Variables' : ('variable', []),
- 'VariableFiles' : ('variablefile', []),
- 'Listeners' : ('listener', []),
+ 'VariableFiles' : ('variablefile', []),
+ 'Listeners' : ('listener', []),
'DebugFile' : ('debugfile', 'NONE'),}
_optional_outputs =
['Log', 'Report', 'Summary', 'DebugFile', 'XUnitFile']
-
+
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'] ]
settings = RebotSettings(log=False)
- settings._opts = self._opts.copy()
+ settings._opts.update(self._opts)
for name in ['Variables', 'VariableFiles', 'Listeners']:
del(settings._opts[name])
for name in
['Include', 'Exclude', 'TestNames', 'SuiteNames', 'Metadata']:
=======================================
--- /trunk/src/robot/output/readers.py Thu Feb 3 03:24:43 2011
+++ /trunk/src/robot/output/readers.py Thu Feb 3 04:04:27 2011
@@ -192,14 +192,10 @@
self.elapsedtime = utils.get_elapsed_time(self.starttime,
self.endtime)
def _times_from_settings(self, settings):
- try:
- return (self._get_time(settings['StartTime']),
- self._get_time(settings['EndTime']))
- except (KeyError, TypeError):
- # We end up here if the settings do not contain
StartTime/Endtime
- # (i.e. if pybot, not rebot, is executed) or if the API is used
- # from outside, in which case settings is None.
+ if not settings:
return 'N/A', 'N/A'
+ return (self._get_time(settings['StartTime']),
+ self._get_time(settings['EndTime']))
def _get_time(self, timestamp):
if not timestamp or utils.eq(timestamp, 'N/A'):
