2 new revisions:
Revision: 2465d5519608
Branch: default
Author: Pekka Klärck
Date: Wed May 29 05:05:22 2013
Log: new run: SkipTeardownOnExit
http://code.google.com/p/robotframework/source/detail?r=2465d5519608
Revision: a4f5159db970
Branch: default
Author: Pekka Klärck
Date: Wed May 29 05:05:27 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=a4f5159db970
==============================================================================
Revision: 2465d5519608
Branch: default
Author: Pekka Klärck
Date: Wed May 29 05:05:22 2013
Log: new run: SkipTeardownOnExit
http://code.google.com/p/robotframework/source/detail?r=2465d5519608
Modified:
/src/robot/conf/settings.py
/src/robot/new_running/runner.py
/src/robot/new_running/status.py
=======================================
--- /src/robot/conf/settings.py Wed May 29 03:57:10 2013
+++ /src/robot/conf/settings.py Wed May 29 05:05:22 2013
@@ -295,7 +295,7 @@
'LogLevel' : ('loglevel', 'INFO'),
'DryRun' : ('dryrun', False),
'ExitOnFailure' : ('exitonfailure', False),
- 'SkipTearDownOnExit' : ('skipteardownonexit',
False),
+ 'SkipTeardownOnExit' : ('skipteardownonexit',
False),
'Randomize' : ('randomize', 'None'),
'RunMode' : ('runmode', []),
'RunEmptySuite' : ('runemptysuite', False),
=======================================
--- /src/robot/new_running/runner.py Wed May 29 04:40:25 2013
+++ /src/robot/new_running/runner.py Wed May 29 05:05:22 2013
@@ -73,7 +73,8 @@
self._suite.suites.append(result)
self._suite = result
self._suite_status = SuiteStatus(self._suite_status,
- self._settings.exit_on_failure)
+ self._settings.exit_on_failure,
+
self._settings.skip_teardown_on_exit)
self._output.start_suite(self._suite)
self._run_setup(suite.keywords.setup, self._suite_status)
self._executed_tests = utils.NormalizedDict(ignore='_')
=======================================
--- /src/robot/new_running/status.py Wed May 29 04:40:25 2013
+++ /src/robot/new_running/status.py Wed May 29 05:05:22 2013
@@ -20,18 +20,25 @@
self.setup_failure = None
self.test_failure = None
self.teardown_failure = None
- self.teardown_allowed = False
+ self._teardown_allowed = False
self.exiting_on_failure = parent.exiting_on_failure if parent else
False
+ self.skip_teardown_on_exit_mode =
parent.skip_teardown_on_exit_mode if parent else False
def setup_executed(self, failure=None):
if failure:
self.setup_failure = unicode(failure)
- self.teardown_allowed = True
+ self._teardown_allowed = True
def teardown_executed(self, failure=None):
if failure:
self.teardown_failure = unicode(failure)
+ @property
+ def teardown_allowed(self):
+ if self.exiting_on_failure and self.skip_teardown_on_exit_mode:
+ return False
+ return self._teardown_allowed
+
@property
def failures(self):
return bool(self._parent_failures() or self._my_failures())
@@ -66,12 +73,14 @@
class SuiteStatus(_ExecutionStatus):
- def __init__(self, parent, exit_on_failure_mode=False):
+ def __init__(self, parent, exit_on_failure_mode=False,
+ skip_teardown_on_exit_mode=False):
_ExecutionStatus.__init__(self, parent)
- self._exit_on_failure_mode = exit_on_failure_mode
+ self.exit_on_failure_mode = exit_on_failure_mode
+ self.skip_teardown_on_exit_mode = skip_teardown_on_exit_mode
def critical_failure(self):
- if self._exit_on_failure_mode:
+ if self.exit_on_failure_mode:
self.exiting_on_failure = True
if self.parent:
self.parent.critical_failure()
@@ -89,6 +98,7 @@
self.test_failure = unicode(failure)
if critical:
self.parent.critical_failure()
+ self.exiting_on_failure = self.parent.exiting_on_failure
def _my_message(self):
return TestMessage(self).message
@@ -98,18 +108,14 @@
setup_message = NotImplemented
teardown_message = NotImplemented
also_teardown_message = NotImplemented
- exit_on_failure_message = NotImplemented
def __init__(self, status):
self.setup_failure = status.setup_failure
self.test_failure = status.test_failure or ''
self.teardown_failure = status.teardown_failure
- self.exiting_on_failure = False
@property
def message(self):
- if self.exiting_on_failure:
- return self.exit_on_failure_message
msg = self._get_message_before_teardown()
return self._get_message_after_teardown(msg)
@@ -137,6 +143,15 @@
_Message.__init__(self, status)
self.exiting_on_failure = status.exiting_on_failure
+ @property
+ def message(self):
+ message = super(TestMessage, self).message
+ if message:
+ return message
+ if self.exiting_on_failure:
+ return self.exit_on_failure_message
+ return ''
+
class SuiteMessage(_Message):
setup_message = 'Suite setup failed:\n%s'
==============================================================================
Revision: a4f5159db970
Branch: default
Author: Pekka Klärck
Date: Wed May 29 05:05:27 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=a4f5159db970
--
---
You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
