Author: janne.t.harkonen
Date: Tue Mar 24 08:02:07 2009
New Revision: 1504
Modified:
trunk/src/robot/output/readers.py
trunk/src/robot/parsing/__init__.py
trunk/src/robot/running/userkeyword.py
trunk/src/robot/variables/__init__.py
Log:
Some more SYSLOG related changes and minor cleanup.
Still not completely done.
Modified: trunk/src/robot/output/readers.py
==============================================================================
--- trunk/src/robot/output/readers.py (original)
+++ trunk/src/robot/output/readers.py Tue Mar 24 08:02:07 2009
@@ -18,6 +18,7 @@
from robot import utils
from robot.errors import DataError
from robot.common import BaseTestSuite, BaseTestCase, BaseKeyword
+from robot.output import SYSLOG
RERAISE = (KeyboardInterrupt, SystemExit, MemoryError)
@@ -26,21 +27,21 @@
RERAISE += (OutOfMemoryError,)
-def process_outputs(paths, settings, syslog=None):
+def process_outputs(paths, settings):
if not paths:
raise DataError('No output files given.')
if len(paths) == 1:
- return process_output(paths[0], syslog)
- testsuite = CombinedTestSuite(settings['StartTime'],
settings['EndTime'])
- testsyslog = CombinedSyslog()
+ return process_output(paths[0])
+ suite = CombinedTestSuite(settings['StartTime'], settings['EndTime'])
+ exec_errors = CombinedExecErrors()
for path in paths:
- subsuite, subsyslog = process_output(path, syslog)
- testsuite.add_suite(subsuite)
- testsyslog.add(subsyslog)
- return testsuite, testsyslog
+ subsuite, suberrors = process_output(path)
+ suite.add_suite(subsuite)
+ exec_errors.add(suberrors)
+ return suite, exec_errors
-def process_output(path, read_level=-1, syslog=None):
+def process_output(path, read_level=-1):
"""Process one Robot output xml file and return TestSuite and Syslog
'read_level' can be used to limit how many suite levels are read. This
is
@@ -48,8 +49,7 @@
"""
if not os.path.isfile(path):
raise DataError("Output file '%s' does not exist." % path)
- if syslog is not None:
- syslog.info("Processing output file '%s'." % path)
+ SYSLOG.info("Processing output file '%s'." % path)
try:
root = utils.DomWrapper(path)
except RERAISE:
@@ -64,7 +64,7 @@
syslognode = root.get_node('syslog')
except AttributeError:
syslognode = None
- return TestSuite(suite, read_level), Syslog(syslognode)
+ return TestSuite(suite, read_level), ExecErrors(syslognode)
def _get_suite_node(root):
@@ -327,7 +327,7 @@
return "'%s %s'" % (self.level, msg.replace("'",'"'))
-class Syslog:
+class ExecErrors:
def __init__(self, node):
if node is None:
@@ -342,7 +342,7 @@
serializer.end_syslog(self)
-class CombinedSyslog(Syslog):
+class CombinedExecErrors(ExecErrors):
def __init__(self):
self.messages = []
Modified: trunk/src/robot/parsing/__init__.py
==============================================================================
--- trunk/src/robot/parsing/__init__.py (original)
+++ trunk/src/robot/parsing/__init__.py Tue Mar 24 08:02:07 2009
@@ -16,7 +16,6 @@
from rawdata import RawData
from resourcefile import ResourceFile
from robot.conf.settings import RobotSettings
-from robot.output.systemlogger import SystemLogger
def TestSuite(*datasources, **options):
@@ -27,8 +26,4 @@
their names are same as long command line options without hyphens.
"""
settings = RobotSettings(options)
- try:
- syslog = options['syslog']
- except KeyError:
- syslog = SystemLogger(settings)
- return TestSuiteData(datasources, settings, syslog)
+ return TestSuiteData(datasources, settings)
Modified: trunk/src/robot/running/userkeyword.py
==============================================================================
--- trunk/src/robot/running/userkeyword.py (original)
+++ trunk/src/robot/running/userkeyword.py Tue Mar 24 08:02:07 2009
@@ -24,14 +24,11 @@
from timeouts import KeywordTimeout
-def PublicUserLibrary(path, syslog=None):
+def PublicUserLibrary(path):
"""Create a user library instance from given resource file."""
from robot.parsing import ResourceFile
- from robot.output import SystemLogger
- if syslog is None:
- syslog = SystemLogger()
- resource = ResourceFile(path, syslog)
+ resource = ResourceFile(path)
ret = UserLibrary(resource.user_keywords, path)
ret.doc = resource.doc
return ret
Modified: trunk/src/robot/variables/__init__.py
==============================================================================
--- trunk/src/robot/variables/__init__.py (original)
+++ trunk/src/robot/variables/__init__.py Tue Mar 24 08:02:07 2009
@@ -16,6 +16,7 @@
import os
from robot import utils
+from robot.output import SYSLOG
from variables import Variables
from isvar import is_var, is_scalar_var, is_list_var
