Revision: 4be1ae3911bf
Author: Pekka Klärck
Date: Fri Sep 23 02:36:53 2011
Log: latest fixes for listeners logging something removed the need to
disable message method if it fails
http://code.google.com/p/robotframework/source/detail?r=4be1ae3911bf
Modified:
/atest/robot/output/listener_interface/listener_methods.txt
/src/robot/output/listeners.py
=======================================
--- /atest/robot/output/listener_interface/listener_methods.txt Thu Sep 15
06:39:05 2011
+++ /atest/robot/output/listener_interface/listener_methods.txt Fri Sep 23
02:36:53 2011
@@ -159,6 +159,5 @@
Calling listener failed
[Arguments] ${method} ${error}
- ${is_disabled} = Set Variable If '${method}'=='message' ${SPACE}and
is disabled ${EMPTY}
Check Stderr Contains [ ERROR ] Calling listener method '${method}' of
- ... listener 'listeners.InvalidMethods' failed${is_disabled}: ${error}
+ ... listener 'listeners.InvalidMethods' failed: ${error}
=======================================
--- /src/robot/output/listeners.py Fri Sep 23 01:48:29 2011
+++ /src/robot/output/listeners.py Fri Sep 23 02:36:53 2011
@@ -233,23 +233,10 @@
try:
method(*args)
except:
- disabled = self._disable_message_method_if_it_failed(method)
- self._report_error(method.__name__, disabled)
-
- def _disable_message_method_if_it_failed(self, method):
- # This avoids recursion caused by message method failing
repeatingly:
- # http://code.google.com/p/robotframework/issues/detail?id=832
- if method is self.message:
- self.message = lambda msg: None
- return True
- return False
-
- def _report_error(self, name, disabled):
- message, details = utils.get_error_details()
- is_disabled = ' and is disabled' if disabled else ''
- LOGGER.error("Calling listener method '%s' of listener '%s'
failed%s: %s"
- % (name, self.name, is_disabled, message))
- LOGGER.info("Details:\n%s" % details)
+ message, details = utils.get_error_details()
+ LOGGER.error("Calling listener method '%s' of listener '%s'
failed: %s"
+ % (method.__name__, self.name, message))
+ LOGGER.info("Details:\n%s" % details)
def _to_map(self, dictionary):
map = HashMap()
