Revision: 3037
Author: KariHusa
Date: Mon Apr 19 23:34:05 2010
Log: Cleanup
http://code.google.com/p/robotframework/source/detail?r=3037
Modified:
/trunk/src/robot/running/model.py
=======================================
--- /trunk/src/robot/running/model.py Sun Apr 18 06:56:03 2010
+++ /trunk/src/robot/running/model.py Mon Apr 19 23:34:05 2010
@@ -207,11 +207,10 @@
def run(self, output, namespace, error=None):
self._start_run(output, namespace, error)
- if not self._run_errors.parent_errors():
+ if not self._run_preventing_errors():
self._run(output, namespace)
else:
- self.status = 'FAIL'
- self.message = self._run_errors.orig_or_init_error()
+ self._run_failed()
self._end_run(output, namespace)
def _start_run(self, output, namespace, error):
@@ -237,6 +236,9 @@
if not self.keywords:
return 'Test case contains no keywords'
+ def _run_preventing_errors(self):
+ return self._run_errors.parent_errors()
+
def _run(self, output, namespace):
namespace.variables['${TEST_NAME}'] = self.name
namespace.variables['@{TEST_TAGS}'] = self.tags
@@ -255,6 +257,10 @@
self.status = 'FAIL'
self.message = self.timeout.get_message()
+ def _run_failed(self):
+ self.status = 'FAIL'
+ self.message = self._run_errors.orig_or_init_error()
+
def _end_run(self, output, namespace):
self.endtime = utils.get_timestamp()
self.elapsedtime = utils.get_elapsed_time(self.starttime,
self.endtime)
--
Subscription settings:
http://groups.google.com/group/robotframework-commit/subscribe?hl=en
