Revision: 2c8f8b6cea69
Branch:   default
Author:   Jussi Malinen <jussi.ao.mali...@gmail.com>
Date:     Tue Jun 10 18:44:46 2014 UTC
Log: add support for module libraries having listener. Also added log message check to an existing test
http://code.google.com/p/robotframework/source/detail?r=2c8f8b6cea69

Added:
 /atest/robot/test_libraries/as_listener_with_v1_module.txt
 /atest/testdata/test_libraries/as_listener/module_v1_listenerlibrary.py
 /atest/testdata/test_libraries/as_listener/module_v1_listenerlibrary.txt
Modified:
 /atest/robot/test_libraries/as_listener_with_empty_library.txt
 /atest/testdata/test_libraries/as_listener/empty_listenerlibrary.py
 /src/robot/running/testlibraries.py

=======================================
--- /dev/null
+++ /atest/robot/test_libraries/as_listener_with_v1_module.txt Tue Jun 10 18:44:46 2014 UTC
@@ -0,0 +1,14 @@
+*** Settings ***
+Suite Setup     Run Tests  ${EMPTY}
+...      test_libraries/as_listener/module_v1_listenerlibrary.txt
+Force Tags      regression  jybot  pybot
+Resource        atest_resource.txt
+
+*** Test Cases ***
+Module listener with v1 version listener api
+    Stderr Should Match
+    ...     SEPARATOR=\n
+    ...     *START TEST Dummy test \ []
+    ...     END TEST PASS${SPACE}
+    ...     CLOSE
+    Check Stderr Does Not Contain     WARN
=======================================
--- /dev/null
+++ /atest/testdata/test_libraries/as_listener/module_v1_listenerlibrary.py Tue Jun 10 18:44:46 2014 UTC
@@ -0,0 +1,18 @@
+import sys
+
+
+class Listener(object):
+
+    def start_test(self, name, doc, tags):
+        self._stderr("START TEST %s %s %s" % (name, doc, tags))
+
+    def end_test(self, status, message):
+        self._stderr("END TEST %s %s" % (status, message))
+
+    def close(self):
+        self._stderr("CLOSE")
+
+    def _stderr(self, msg):
+        sys.__stderr__.write("%s\n" % msg)
+
+ROBOT_LIBRARY_LISTENER = Listener()
=======================================
--- /dev/null
+++ /atest/testdata/test_libraries/as_listener/module_v1_listenerlibrary.txt Tue Jun 10 18:44:46 2014 UTC
@@ -0,0 +1,7 @@
+*** Settings ***
+Library    module_v1_listenerlibrary.py
+
+
+*** Test Cases ***
+Dummy test
+    Log   ploo
=======================================
--- /atest/robot/test_libraries/as_listener_with_empty_library.txt Tue Jun 10 10:57:54 2014 UTC +++ /atest/robot/test_libraries/as_listener_with_empty_library.txt Tue Jun 10 18:44:46 2014 UTC
@@ -9,6 +9,9 @@
     Stderr Should Match
     ...     SEPARATOR=\n
     ...     *START TEST
+    ...     MESSAGE Arguments: [ u'We do nothing' ]
+    ...     MESSAGE We do nothing
+    ...     MESSAGE Return: None
     ...     END TEST
     ...     CLOSE
     Check Stderr Does Not Contain     WARN
=======================================
--- /atest/testdata/test_libraries/as_listener/empty_listenerlibrary.py Tue Jun 10 08:47:18 2014 UTC +++ /atest/testdata/test_libraries/as_listener/empty_listenerlibrary.py Tue Jun 10 18:44:46 2014 UTC
@@ -14,6 +14,9 @@
     def _end_test(self, name, attrs):
         self._stderr("END TEST")

+    def log_message(self, msg):
+        self._stderr("MESSAGE %s" % msg['message'])
+
     def _close(self):
         self._stderr("CLOSE")

=======================================
--- /src/robot/running/testlibraries.py Wed May 28 12:53:02 2014 UTC
+++ /src/robot/running/testlibraries.py Tue Jun 10 18:44:46 2014 UTC
@@ -274,6 +274,8 @@
         return method

     def get_instance(self):
+        if self.has_listener is None:
+ self.has_listener = self._get_listener(self._libcode) is not None
         return self._libcode

     def _create_init_handler(self, libcode):

--

--- You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to robotframework-commit+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to