Revision: 3990
Author: jussi.ao.malinen
Date: Mon Aug 30 06:18:21 2010
Log: removed html-attribute from log messages if its value is no. also
minor cleanup.
http://code.google.com/p/robotframework/source/detail?r=3990
Modified:
/trunk/src/robot/output/xmllogger.py
/trunk/src/robot/serializing/logserializers.py
=======================================
--- /trunk/src/robot/output/xmllogger.py Mon Aug 30 05:53:20 2010
+++ /trunk/src/robot/output/xmllogger.py Mon Aug 30 06:18:21 2010
@@ -28,10 +28,9 @@
self._namegen = utils.FileNameGenerator(path)
self._log_message_is_logged = IsLogged(log_level)
self._error_is_logged = IsLogged('WARN')
- attrs = { 'generator': get_full_version(generator),
- 'generated': utils.get_timestamp() }
self._writer = None
- self._writer_args = (path, attrs)
+ self._writer_args = (path, {'generator':
get_full_version(generator),
+ 'generated': utils.get_timestamp()})
self._index_writer = None
self._split_level = split_level
self._suite_level = 0
@@ -71,14 +70,15 @@
return self._log_message_is_logged.set_level(level)
def _message(self, msg):
- html = msg.html and 'yes' or 'no'
- attrs = { 'timestamp': msg.timestamp, 'level': msg.level, 'html':
html }
+ attrs = {'timestamp': msg.timestamp, 'level': msg.level}
+ if msg.html:
+ attrs['html'] = 'yes'
if msg.linkable:
attrs['linkable'] = 'yes'
self._writer.element('msg', msg.message, attrs)
def start_keyword(self, kw):
- attrs = { 'name': kw.name, 'type': kw.type, 'timeout': kw.timeout }
+ attrs = {'name': kw.name, 'type': kw.type, 'timeout': kw.timeout}
self._writer.start('kw', attrs)
self._writer.element('doc', kw.doc)
self._write_list('arg', [utils.unic(a) for a in
kw.args], 'arguments')
@@ -88,8 +88,8 @@
self._writer.end('kw')
def start_test(self, test):
- attrs = { 'name': test.name, 'critical': test.critical,
- 'timeout': str(test.timeout) }
+ attrs = {'name': test.name, 'critical': test.critical,
+ 'timeout': str(test.timeout)}
self._writer.start('test', attrs)
self._writer.element('doc', test.doc)
@@ -215,6 +215,6 @@
self._writer.end(container)
def _write_status(self, item, message=None):
- attrs = { 'status': item.status, 'starttime': item.starttime,
- 'endtime': item.endtime }
- self._writer.element('status', message, attrs)
+ self._writer.element('status', message, {'status': item.status,
+ 'starttime':
item.starttime,
+ 'endtime': item.endtime})
=======================================
--- /trunk/src/robot/serializing/logserializers.py Mon Aug 30 05:53:20 2010
+++ /trunk/src/robot/serializing/logserializers.py Mon Aug 30 06:18:21 2010
@@ -282,20 +282,23 @@
def message(self, msg):
self._writer.start('tr')
self._writer.start('td', {'class': 'time'}, newline=False)
- if msg.linkable:
- self._writer.element('a', msg.timestamp.replace(' ', ' '),
- {'href': "#msg_%s" % msg.timestamp,
- 'onclick': "set_element_visible('msg_%s')" %
msg.timestamp,
- 'title': 'Link to details.'},
- escape=False, newline=False)
- else:
- self._writer.content(msg.timestamp.replace(' ', ' '),
escape=False)
+ self._write_timestamp(msg)
self._writer.end('td')
self._writer.element('td', msg.level,
{'class': '%s level' % msg.level.lower()})
self._writer.element('td', msg.message, {'class': 'msg'})
self._writer.end('tr')
+ def _write_timestamp(self, msg):
+ if msg.linkable:
+ attrs = {'href': "#msg_%s" % msg.timestamp,
+ 'onclick': "set_element_visible('msg_%s')" %
msg.timestamp,
+ 'title': 'Link to details.'}
+ self._writer.start('a', attrs, newline=False)
+ self._writer.content(msg.timestamp.replace(' ', ' '),
escape=False)
+ if msg.linkable:
+ self._writer.end('a', newline=False)
+
def end_errors(self, errors):
if errors.messages:
self._writer.end('table')
