Revision: 2438
Author: janne.t.harkonen
Date: Tue Feb 16 04:41:01 2010
Log: whitespace
http://code.google.com/p/robotframework/source/detail?r=2438
Modified:
/trunk/atest/robot/output/listener_interface/listener_methods.txt
/trunk/atest/testresources/listeners/ListenAll.py
/trunk/src/robot/output/listeners.py
=======================================
--- /trunk/atest/robot/output/listener_interface/listener_methods.txt Tue
Feb 16 04:26:09 2010
+++ /trunk/atest/robot/output/listener_interface/listener_methods.txt Tue
Feb 16 04:41:01 2010
@@ -85,19 +85,24 @@
... TEST START: Pass '' ['force', 'pass']
... KW START: My Keyword ['Pass']
... KW START: BuiltIn.Log ['Hello says "\${who}"!', '\${LEVEL1}']
+ ... LOG MESSAGE: [INFO] Hello says "Pass"
... KW END: PASS
... KW START: BuiltIn.Log ['Debug message', '\${LEVEL2}']
+ ... LOG MESSAGE: [DEBUG] Debug message
... KW END: PASS
... KW END: PASS
... TEST END: PASS
... TEST START: Fail 'FAIL Expected failure' ['fail', 'force']
... KW START: My Keyword ['Fail']
... KW START: BuiltIn.Log ['Hello says "\${who}"!', '\${LEVEL1}']
+ ... LOG MESSAGE: [INFO] Hello says "Fail"
... KW END: PASS
... KW START: BuiltIn.Log ['Debug message', '\${LEVEL2}']
+ ... LOG MESSAGE: [DEBUG] Debug message
... KW END: PASS
... KW END: PASS
... KW START: BuiltIn.Fail ['Expected failure']
+ ... LOG MESSAGE: [FAIL] Expected failure
... KW END: FAIL
... TEST END: FAIL Expected failure
... SUITE END: FAIL 2 critical tests, 1 passed, 1 failed
=======================================
--- /trunk/atest/testresources/listeners/ListenAll.py Tue Feb 16 04:27:56
2010
+++ /trunk/atest/testresources/listeners/ListenAll.py Tue Feb 16 04:41:01
2010
@@ -24,6 +24,8 @@
args = [ str(arg) for arg in attrs['args'] ]
self.outfile.write("KW START: %s %s\n" % (name, args))
+ def message(self, message):
+ self.outfile.write('MESSAGE: [%s] %s \n' % (message.level,
message.message))
def end_keyword(self, name, attrs):
self.outfile.write("KW END: %s\n" % (attrs['status']))
=======================================
--- /trunk/src/robot/output/listeners.py Sun Apr 19 13:26:54 2009
+++ /trunk/src/robot/output/listeners.py Tue Feb 16 04:41:01 2010
@@ -26,10 +26,10 @@
class Listeners:
-
+
_start_attrs = ['doc', 'starttime', 'longname']
_end_attrs = _start_attrs +
['endtime', 'elapsedtime', 'status', 'message']
-
+
def __init__(self, listeners):
self._listeners = self._import_listneres(listeners)
@@ -56,18 +56,18 @@
li.call_method(li.start_suite, suite.name, suite.doc)
else:
attrs = self._get_start_attrs(suite, [])
- li.call_method(li.start_suite, suite.name, attrs)
+ li.call_method(li.start_suite, suite.name, attrs)
def end_suite(self, suite):
for li in self._listeners:
if li.version == 1:
- li.call_method(li.end_suite, suite.status,
+ li.call_method(li.end_suite, suite.status,
suite.get_full_message())
else:
- attrs = self._get_end_attrs(suite, [],
+ attrs = self._get_end_attrs(suite, [],
{'statistics': 'get_stat_message'})
li.call_method(li.end_suite, suite.name, attrs)
-
+
def start_test(self, test):
for li in self._listeners:
if li.version == 1:
@@ -75,7 +75,7 @@
else:
attrs = self._get_start_attrs(test, ['tags'])
li.call_method(li.start_test, test.name, attrs)
-
+
def end_test(self, test):
for li in self._listeners:
if li.version == 1:
@@ -90,8 +90,8 @@
li.call_method(li.start_keyword, kw.name, kw.args)
else:
attrs = self._get_start_attrs(kw, ['args', '-longname'])
- li.call_method(li.start_keyword, kw.name, attrs)
-
+ li.call_method(li.start_keyword, kw.name, attrs)
+
def end_keyword(self, kw):
for li in self._listeners:
if li.version == 1:
@@ -103,14 +103,14 @@
def output_file(self, name, path):
for li in self._listeners:
li.call_method(getattr(li, '%s_file' % name.lower()), path)
-
+
def close(self):
for li in self._listeners:
li.call_method(li.close)
def _get_start_attrs(self, item, names, mapping=None):
return self._get_attrs(item, self._start_attrs, names, mapping)
-
+
def _get_end_attrs(self, item, names, mapping=None):
return self._get_attrs(item, self._end_attrs, names, mapping)
@@ -131,11 +131,11 @@
attr = attr()
attrs[name] = attr
return attrs
-
-
+
+
class _ListenerProxy(AbstractLoggerProxy):
- _methods = ['start_suite', 'end_suite', 'start_test', 'end_test',
- 'start_keyword', 'end_keyword', 'output_file', 'summary_file',
+ _methods = ['start_suite', 'end_suite', 'start_test', 'end_test',
+ 'start_keyword', 'end_keyword', 'output_file', 'summary_file',
'report_file', 'log_file', 'debug_file', 'close']
def __init__(self, name, args):
@@ -151,7 +151,7 @@
listener = listener(*args)
elif args:
raise DataError("Listeners implemented as modules do not take
arguments")
- LOGGER.info("Imported listener '%s' with arguments %s (source %s)"
+ LOGGER.info("Imported listener '%s' with arguments %s (source %s)"
% (name, utils.seq2str2(args), source))
return listener
