[robotframework] 2 new revisions pushed by [email protected] on 2011-06-13 09:43 GMT

Mon, 13 Jun 2011 02:45:17 -0700 

2 new revisions:

Revision: bc5d4a15e8c3
Author:   Mikko Korpela <[email protected]>
Date:     Mon Jun 13 02:39:10 2011
Log:      test_reporting: disable console logging in reporting tests
http://code.google.com/p/robotframework/source/detail?r=bc5d4a15e8c3

Revision: fe98ff7212f2
Author:   Mikko Korpela <[email protected]>
Date:     Mon Jun 13 02:43:40 2011
Log:      Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=fe98ff7212f2

==============================================================================
Revision: bc5d4a15e8c3
Author:   Mikko Korpela <[email protected]>
Date:     Mon Jun 13 02:39:10 2011
Log:      test_reporting: disable console logging in reporting tests
http://code.google.com/p/robotframework/source/detail?r=bc5d4a15e8c3

Modified:
 /utest/serializing/test_reporting.py

=======================================
--- /utest/serializing/test_reporting.py        Fri Jun  3 03:42:48 2011
+++ /utest/serializing/test_reporting.py        Mon Jun 13 02:39:10 2011
@@ -1,7 +1,9 @@
 import unittest
+from robot.output.logger import Logger
 from robot.output.readers import ExecutionErrors
 import resources
 from robot.common.model import BaseTestSuite
+import robot.output
 from robot.serializing.testoutput import Reporter
 import robot.serializing.testoutput

@@ -68,10 +70,16 @@
             'EndTime': 0,
             'LogLevel': 'INFO'
         }
+        self._original_logger = robot.serializing.testoutput.LOGGER
+        robot.serializing.testoutput.LOGGER = Logger()
+ robot.serializing.testoutput.LOGGER.disable_automatic_console_logger() 
         self._log_results = set_serialize_log_mock()
         self._report_results = set_serialize_report_mock()
         #self._process_outputs_results = set_process_outputs_mock()

+    def tearDown(self):
+        robot.serializing.testoutput.LOGGER = self._original_logger
+
     def test_generate_report_and_log(self):
         self._settings['Log'] = 'log.html'
         self._settings['Report'] = 'report.html'

==============================================================================
Revision: fe98ff7212f2
Author:   Mikko Korpela <[email protected]>
Date:     Mon Jun 13 02:43:40 2011
Log:      Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=fe98ff7212f2

Modified:
 /utest/serializing/test_reporting.py

=======================================
--- /utest/serializing/test_reporting.py        Mon Jun 13 01:48:54 2011
+++ /utest/serializing/test_reporting.py        Mon Jun 13 02:43:40 2011
@@ -1,7 +1,9 @@
 import unittest
+from robot.output.logger import Logger
 from robot.output.readers import ExecutionErrors
 import resources
 from robot.common.model import BaseTestSuite
+import robot.output
 from robot.serializing.testoutput import Reporter
 import robot.serializing.testoutput

@@ -68,10 +70,16 @@
             'EndTime': 0,
             'LogLevel': 'INFO'
         }
+        self._original_logger = robot.serializing.testoutput.LOGGER
+        robot.serializing.testoutput.LOGGER = Logger()
+ robot.serializing.testoutput.LOGGER.disable_automatic_console_logger() 
         self._log_results = set_serialize_log_mock()
         self._report_results = set_serialize_report_mock()
         #self._process_outputs_results = set_process_outputs_mock()

+    def tearDown(self):
+        robot.serializing.testoutput.LOGGER = self._original_logger
+
     def test_generate_report_and_log(self):
         self._settings['Log'] = 'log.html'
         self._settings['Report'] = 'report.html'

Reply via email to