Revision: 3014
Author: janne.t.harkonen
Date: Fri Apr 16 02:35:03 2010
Log: Always execute suite teardown
http://code.google.com/p/robotframework/source/detail?r=3014
Modified:
/trunk/src/robot/running/model.py
=======================================
--- /trunk/src/robot/running/model.py Fri Apr 16 01:32:58 2010
+++ /trunk/src/robot/running/model.py Fri Apr 16 02:35:03 2010
@@ -93,7 +93,8 @@
% '\n'.join(errors))
def _run_setup(self, output):
- self._run_errors.setup_err(self._run_fixture(self.setup, output))
+ if not self._run_errors:
+ self._run_errors.setup_err(self._run_fixture(self.setup,
output))
def _run_teardown(self, output):
td_err = self._run_fixture(self.teardown, output)
@@ -101,7 +102,7 @@
self.suite_teardown_failed('Suite teardown failed:\n%s' %
td_err)
def _run_fixture(self, fixture, output):
- if fixture and not self._run_errors:
+ if fixture:
try:
fixture.run(output, self.namespace)
except ExecutionFailed:
--
Subscription settings:
http://groups.google.com/group/robotframework-commit/subscribe?hl=en
