Revision: 4008
Author: jussi.ao.malinen
Date: Tue Aug 31 05:54:05 2010
Log: XmlParsingError didn't give any benefits anymore
http://code.google.com/p/robotframework/source/detail?r=4008
Modified:
/trunk/src/robot/__init__.py
/trunk/src/robot/errors.py
/trunk/src/robot/output/readers.py
=======================================
--- /trunk/src/robot/__init__.py Thu Aug 26 06:28:35 2010
+++ /trunk/src/robot/__init__.py Tue Aug 31 05:54:05 2010
@@ -24,8 +24,8 @@
from conf import RobotSettings, RebotSettings
from running import TestSuite, STOP_SIGNAL_MONITOR
from serializing import RobotTestOutput, RebotTestOutput,
SplitIndexTestOutput
-from errors import DataError, Information, XmlParsingError, INFO_PRINTED, \
- DATA_ERROR, STOPPED_BY_USER, FRAMEWORK_ERROR
+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
import utils
@@ -58,10 +58,8 @@
LOGGER.info('Data sources: %s' % utils.seq2str(datasources))
try:
suite = method(*datasources, **options)
- except DataError:
- _exit(DATA_ERROR, *utils.get_error_details())
- except XmlParsingError, error:
- _exit(DATA_ERROR, utils.unic(error), error.traceback)
+ except DataError, err:
+ _exit(DATA_ERROR, unicode(err))
except (KeyboardInterrupt, SystemExit):
_exit(STOPPED_BY_USER, 'Execution stopped by user.')
except:
=======================================
--- /trunk/src/robot/errors.py Wed Aug 25 06:25:53 2010
+++ /trunk/src/robot/errors.py Tue Aug 31 05:54:05 2010
@@ -139,16 +139,9 @@
return self._errors
-class _RobotErrorWithTrace(RobotError):
+class RemoteError(RobotError):
+ """Used by Remote library to report remote errors."""
def __init__(self, message, traceback):
RobotError.__init__(self, message)
self.traceback = traceback
-
-
-class RemoteError(_RobotErrorWithTrace):
- """Used by Remote library to report remote errors."""
-
-
-class XmlParsingError(_RobotErrorWithTrace):
- """Used when parsing XML fails."""
=======================================
--- /trunk/src/robot/output/readers.py Tue Aug 31 02:04:30 2010
+++ /trunk/src/robot/output/readers.py Tue Aug 31 05:54:05 2010
@@ -16,7 +16,7 @@
import os.path
from robot import utils
-from robot.errors import DataError, XmlParsingError
+from robot.errors import DataError
from robot.common import BaseTestSuite, BaseTestCase, BaseKeyword
from robot.output import LOGGER
from robot.output.loggerhelper import IsLogged, Message
@@ -47,12 +47,9 @@
LOGGER.info("Processing output file '%s'." % path)
try:
root = utils.DomWrapper(path)
- except utils.RERAISED_EXCEPTIONS:
- raise
except:
- message, traceback = utils.get_error_details()
- raise XmlParsingError("Opening XML file '%s' failed: %s" %
- (path, message), traceback)
+ err = utils.get_error_message()
+ raise DataError("Opening XML file '%s' failed: %s" % (path, err))
suite = _get_suite_node(root, path)
errors = _get_errors_node(root)
return TestSuite(suite, read_level, log_level=log_level),
ExecutionErrors(errors)
