Revision: fd2b284c1abf
Author: Pekka Klärck
Date: Mon Dec 19 04:55:53 2011
Log: very random cleanup
http://code.google.com/p/robotframework/source/detail?r=fd2b284c1abf
Modified:
/src/robot/__init__.py
/src/robot/output/filelogger.py
/src/robot/output/logger.py
/utest/reporting/test_reporting.py
=======================================
--- /src/robot/__init__.py Sun Dec 18 16:32:16 2011
+++ /src/robot/__init__.py Mon Dec 19 04:55:53 2011
@@ -42,15 +42,15 @@
if 'pythonpathsetter' not in sys.modules:
import pythonpathsetter
-import utils
-from output import Output, LOGGER, pyloggingconf
-from conf import RobotSettings, RebotSettings
-from running import TestSuite, STOP_SIGNAL_MONITOR
+from robot.conf import RobotSettings, RebotSettings
+from robot.errors import (DataError, Information, INFO_PRINTED, DATA_ERROR,
+ STOPPED_BY_USER, FRAMEWORK_ERROR)
from robot.reporting import ResultWriter
-from errors import (DataError, Information, INFO_PRINTED, DATA_ERROR,
- STOPPED_BY_USER, FRAMEWORK_ERROR)
-from variables import init_global_variables
-from version import get_version, get_full_version
+from robot.running import TestSuite, STOP_SIGNAL_MONITOR
+from robot.output import Output, LOGGER, pyloggingconf
+from robot.variables import init_global_variables
+from robot.version import get_version, get_full_version
+from robot import utils
__version__ = get_version()
@@ -99,6 +99,8 @@
return FRAMEWORK_ERROR
else:
return rc
+ finally:
+ LOGGER.close()
def run(*datasources, **options):
@@ -131,7 +133,6 @@
if settings.is_rebot_needed():
output, settings = settings.get_rebot_datasource_and_settings()
ResultWriter(output).write_results(settings)
- LOGGER.close()
return suite.return_code
@@ -156,7 +157,6 @@
rc = ResultWriter(*datasources).write_results(settings)
if rc < 0:
raise DataError('No outputs created.')
- LOGGER.close()
return rc
=======================================
--- /src/robot/output/filelogger.py Wed Sep 21 08:28:05 2011
+++ /src/robot/output/filelogger.py Mon Dec 19 04:55:53 2011
@@ -13,25 +13,25 @@
# limitations under the License.
import os
-
-from loggerhelper import AbstractLogger
+import codecs
+
+from .loggerhelper import AbstractLogger
class FileLogger(AbstractLogger):
def __init__(self, path, level):
AbstractLogger.__init__(self, level)
- self._writer = self._get_writer(path)
+ self._writer = self._get_writer(path) # unit test hook
def _get_writer(self, path):
- # Hook for unittests
- return open(path, 'wb')
+ return codecs.open(path, 'wb', encoding='UTF-8')
def message(self, msg):
if self._is_logged(msg.level) and not self._writer.closed:
entry = '%s | %s | %s\n' % (msg.timestamp, msg.level.ljust(5),
msg.message)
- self._writer.write(entry.replace('\n',
os.linesep).encode('UTF-8'))
+ self._writer.write(entry.replace('\n', os.linesep))
def start_suite(self, suite):
self.info("Started test suite '%s'" % suite.name)
=======================================
--- /src/robot/output/logger.py Wed Dec 14 03:26:44 2011
+++ /src/robot/output/logger.py Mon Dec 19 04:55:53 2011
@@ -12,15 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
import os
from robot import utils
-from loggerhelper import AbstractLogger, AbstractLoggerProxy, Message
-from filelogger import FileLogger
-from monitor import CommandLineMonitor
-from stdoutlogsplitter import StdoutLogSplitter
+from .filelogger import FileLogger
+from .loggerhelper import AbstractLogger, AbstractLoggerProxy
+from .monitor import CommandLineMonitor
+from .stdoutlogsplitter import StdoutLogSplitter
class Logger(AbstractLogger):
@@ -84,9 +83,8 @@
return
try:
logger = FileLogger(path, level)
- except:
- self.error("Opening syslog file '%s' failed: %s"
- % (path, utils.get_error_message()))
+ except EnvironmentError, err:
+ self.error("Opening syslog file '%s' failed: %s" % (path,
err.strerror))
else:
self.register_logger(logger)
=======================================
--- /utest/reporting/test_reporting.py Sun Dec 18 16:32:16 2011
+++ /utest/reporting/test_reporting.py Mon Dec 19 04:55:53 2011
@@ -66,16 +66,17 @@
self._verify_report(report.value)
def test_log_generation_removes_keywords_from_execution_result(self):
- self._write_results(log=ClosableOutput('log.html'))
- for test in self.execution_result.suite.tests:
+ execution_result =
self._write_results(log=ClosableOutput('log.html'))
+ for test in execution_result.suite.tests:
assert_equals(len(test.keywords), 0)
def _write_results(self, **settings):
- self.execution_result = self._get_execution_result()
+ execution_result = self._get_execution_result()
settings = StubSettings(**settings)
- results = StubResults(self.execution_result, settings)
+ results = StubResults(execution_result, settings)
rc = ResultWriter().write_results(settings, results)
assert_equals(rc, 1)
+ return execution_result
def _get_execution_result(self):
suite = TestSuite(name=self.EXPECTED_SUITE_NAME)
