3 new revisions:
Revision: 77ed95b81ee2
Author: Robot Framework Developers ([email protected])
Date: Wed Nov 30 07:26:04 2011
Log: fixed monkeypatched stub in utests after changing methogs (it
would be...
http://code.google.com/p/robotframework/source/detail?r=77ed95b81ee2
Revision: 1e7e351d8f96
Author: Robot Framework Developers ([email protected])
Date: Wed Nov 30 07:37:01 2011
Log: test reporting only once now that it behaves same way both with
robot ...
http://code.google.com/p/robotframework/source/detail?r=1e7e351d8f96
Revision: 849870bd15a9
Author: Robot Framework Developers ([email protected])
Date: Wed Nov 30 07:38:25 2011
Log: LOGGER.disable_automatic_console_logger()
http://code.google.com/p/robotframework/source/detail?r=849870bd15a9
==============================================================================
Revision: 77ed95b81ee2
Author: Robot Framework Developers ([email protected])
Date: Wed Nov 30 07:26:04 2011
Log: fixed monkeypatched stub in utests after changing methogs (it
would be really good idea to run utests before commit...)
http://code.google.com/p/robotframework/source/detail?r=77ed95b81ee2
Modified:
/utest/reporting/test_reporting.py
=======================================
--- /utest/reporting/test_reporting.py Wed Nov 30 06:19:10 2011
+++ /utest/reporting/test_reporting.py Wed Nov 30 07:26:04 2011
@@ -38,9 +38,9 @@
def set_write_split_test_mock():
results = []
- def _write_test(self, index, keywords, strings, name):
+ def _write_split_log(self, index, keywords, strings, name):
results.append(name)
- LogBuilder._write_test = _write_test
+ LogBuilder._write_split_log = _write_split_log
return results
==============================================================================
Revision: 1e7e351d8f96
Author: Robot Framework Developers ([email protected])
Date: Wed Nov 30 07:37:01 2011
Log: test reporting only once now that it behaves same way both with
robot and rebot
http://code.google.com/p/robotframework/source/detail?r=1e7e351d8f96
Modified:
/utest/reporting/test_reporting.py
=======================================
--- /utest/reporting/test_reporting.py Wed Nov 30 07:26:04 2011
+++ /utest/reporting/test_reporting.py Wed Nov 30 07:37:01 2011
@@ -44,7 +44,7 @@
return results
-class _TestReporting(object):
+class TestReporting(unittest.TestCase):
def setUp(self):
self._settings = RebotSettings()
@@ -86,6 +86,8 @@
self._report_results = set_write_report_mock()
self._xunit_results = set_write_xunit_mock()
self._split_test_names = set_write_split_test_mock()
+ self._output_results = set_write_output_mock()
+ self._reporter = ResultWriter(self._settings)
def test_generate_report_and_log(self):
self._settings._opts['Log'] = 'log.html'
@@ -122,17 +124,14 @@
self._settings._opts['SplitLog'] = True
self._settings._opts['Log'] = '/tmp/foo/log.bar.html'
self._write_results(resources.GOLDEN_OUTPUT)
- expected = ('/tmp/foo/log.bar-%d.js' % i for i in range(1, 5))
- self._assert_expected_split_tests(*expected)
+ expected = ['/tmp/foo/log.bar-%d.js' % i for i in range(1, 5)]
+ self.assertEquals(self._split_test_names, expected)
def _assert_expected_log(self, expected_file_name):
if expected_file_name:
expected_file_name = abspath(expected_file_name)
self.assertEquals(self._log_results['log_path'],
expected_file_name)
- def _assert_expected_split_tests(self, *expected_names):
- self.assertEquals(self._split_test_names, list(expected_names))
-
def _assert_expected_report(self, expected_file_name):
if expected_file_name:
expected_file_name = abspath(expected_file_name)
@@ -154,14 +153,6 @@
def _assert_data_model_generated_once(self):
self.assertEquals(len(self._datamodel_generations), 1)
-
-class TestRebotReporting(_TestReporting, unittest.TestCase):
-
- def setUp(self):
- _TestReporting.setUp(self)
- self._output_results = set_write_output_mock()
- self._reporter = ResultWriter(self._settings)
-
def _write_results(self, *sources):
self._reporter.write_results(*sources)
@@ -181,16 +172,5 @@
self.assertEquals(self._output_results['output_path'],
abspath(expected_file_name))
-
-class TestRobotReporting(_TestReporting, unittest.TestCase):
-
- def setUp(self):
- _TestReporting.setUp(self)
- self._reporter = ResultWriter(self._settings)
-
- def _write_results(self, source):
- self._reporter.write_results(source)
-
-
if __name__ == '__main__':
unittest.main()
==============================================================================
Revision: 849870bd15a9
Author: Robot Framework Developers ([email protected])
Date: Wed Nov 30 07:38:25 2011
Log: LOGGER.disable_automatic_console_logger()
http://code.google.com/p/robotframework/source/detail?r=849870bd15a9
Modified:
/utest/output/test_listeners.py
/utest/parsing/test_populator.py
/utest/reporting/test_reporting.py
/utest/running/test_signalhandler.py
=======================================
--- /utest/output/test_listeners.py Mon Jul 11 07:14:00 2011
+++ /utest/output/test_listeners.py Wed Nov 30 07:38:25 2011
@@ -6,6 +6,7 @@
from robot import utils
from robot.running.outputcapture import OutputCapturer
+LOGGER.disable_automatic_console_logger()
class _Mock:
def __getattr__(self, name):
@@ -198,12 +199,6 @@
class TestInvalidOldStyleListener(unittest.TestCase):
- def setUp(self):
- self._console_logger =
LOGGER._loggers.remove_first_regular_logger()
-
- def tearDown(self):
- LOGGER._loggers._regular_loggers.insert(0, self._console_logger)
-
def test_calling_listener_methods_fails(self):
listenres = Listeners([('test_listeners.InvalidListenerOldStyle',
[])])
for name, args in [('start_suite', [SuiteMock()]),
=======================================
--- /utest/parsing/test_populator.py Tue Oct 18 08:46:58 2011
+++ /utest/parsing/test_populator.py Wed Nov 30 07:38:25 2011
@@ -7,6 +7,8 @@
from robot.output import LOGGER
+LOGGER.disable_automatic_console_logger()
+
class _MockLogger(object):
def __init__(self):
@@ -26,13 +28,11 @@
self._datafile.directory = '/path/to'
self._populator = FromFilePopulator(self._datafile)
self._logger = _MockLogger()
- self._console_logger =
LOGGER._loggers.remove_first_regular_logger()
- LOGGER._message_cache = []
+ LOGGER.disable_message_cache()
LOGGER.register_logger(self._logger)
def tearDown(self):
LOGGER.unregister_logger(self._logger)
- LOGGER._loggers._regular_loggers.insert(0, self._console_logger)
def _assert_no_parsing_errors(self):
assert_true(self._logger.value() == '', self._logger.value())
=======================================
--- /utest/reporting/test_reporting.py Wed Nov 30 07:37:01 2011
+++ /utest/reporting/test_reporting.py Wed Nov 30 07:38:25 2011
@@ -4,9 +4,12 @@
from robot.conf import RebotSettings
from robot.reporting.builders import LogBuilder, ReportBuilder,
XUnitBuilder, OutputBuilder
from robot.reporting.resultwriter import ResultWriter
+from robot.output import LOGGER
import resources
+LOGGER.disable_automatic_console_logger()
+
def set_write_log_mock():
results = {'log_path': None}
=======================================
--- /utest/running/test_signalhandler.py Thu Apr 14 06:09:44 2011
+++ /utest/running/test_signalhandler.py Wed Nov 30 07:38:25 2011
@@ -10,6 +10,9 @@
from robot.running.signalhandler import _StopSignalMonitor
+LOGGER.disable_automatic_console_logger()
+
+
class LoggerStub(AbstractLogger):
def __init__(self):
AbstractLogger.__init__(self)
@@ -21,14 +24,12 @@
class TestSignalHandlerRegisteringFaiures(unittest.TestCase):
def setUp(self):
- self._console_logger =
LOGGER._loggers.remove_first_regular_logger()
self.logger = LoggerStub()
LOGGER._message_cache = []
LOGGER.register_logger(self.logger)
self._orig_signal = signal.signal
def tearDown(self):
- LOGGER._loggers._regular_loggers.insert(0, self._console_logger)
LOGGER.unregister_logger(self.logger)
signal.signal = self._orig_signal
