Revision: 3016
Author: janne.t.harkonen
Date: Fri Apr 16 03:00:37 2010
Log: run teardown even if setup failed
http://code.google.com/p/robotframework/source/detail?r=3016
Modified:
/trunk/src/robot/running/model.py
=======================================
--- /trunk/src/robot/running/model.py Fri Apr 16 02:35:03 2010
+++ /trunk/src/robot/running/model.py Fri Apr 16 03:00:37 2010
@@ -93,8 +93,7 @@
% '\n'.join(errors))
def _run_setup(self, output):
- if not self._run_errors:
- self._run_errors.setup_err(self._run_fixture(self.setup,
output))
+ self._run_errors.setup_err(self._run_fixture(self.setup, output))
def _run_teardown(self, output):
td_err = self._run_fixture(self.teardown, output)
@@ -102,7 +101,7 @@
self.suite_teardown_failed('Suite teardown failed:\n%s' %
td_err)
def _run_fixture(self, fixture, output):
- if fixture:
+ if fixture and not self._run_errors.parent_errors():
try:
fixture.run(output, self.namespace)
except ExecutionFailed:
@@ -162,8 +161,8 @@
self._init_err = None
self._setup_err = None
- def __nonzero__(self):
- return bool(self._parent_err or self._init_err or self._setup_err)
+ def parent_errors(self):
+ return bool(self._parent_err or self._init_err)
def init_err(self, err):
self._init_err = err
--
Subscription settings:
http://groups.google.com/group/robotframework-commit/subscribe?hl=en
