2 new revisions:
Revision: 6f1c83e3ad5d
Branch: default
Author: Pekka Klärck
Date: Wed May 29 10:05:27 2013
Log: partly fixed Run Keyword If Timeout Occurred
http://code.google.com/p/robotframework/source/detail?r=6f1c83e3ad5d
Revision: 19e7b8678820
Branch: default
Author: Pekka Klärck
Date: Wed May 29 10:09:59 2013
Log: always report suite errors if they occurred
http://code.google.com/p/robotframework/source/detail?r=19e7b8678820
==============================================================================
Revision: 6f1c83e3ad5d
Branch: default
Author: Pekka Klärck
Date: Wed May 29 10:05:27 2013
Log: partly fixed Run Keyword If Timeout Occurred
http://code.google.com/p/robotframework/source/detail?r=6f1c83e3ad5d
Modified:
/src/robot/libraries/BuiltIn.py
=======================================
--- /src/robot/libraries/BuiltIn.py Wed May 29 09:53:37 2013
+++ /src/robot/libraries/BuiltIn.py Wed May 29 10:05:27 2013
@@ -1496,7 +1496,7 @@
Available in Robot Framework 2.5 and newer.
"""
test = self._get_test_in_teardown('Run Keyword If Timeout
Occurred')
- if test.timeout.any_timeout_occurred():
+ if test.timeout and test.timeout.any_timeout_occurred():
return self.run_keyword(name, *args)
def _get_test_in_teardown(self, kwname):
==============================================================================
Revision: 19e7b8678820
Branch: default
Author: Pekka Klärck
Date: Wed May 29 10:09:59 2013
Log: always report suite errors if they occurred
http://code.google.com/p/robotframework/source/detail?r=19e7b8678820
Modified:
/src/robot/new_running/runner.py
=======================================
--- /src/robot/new_running/runner.py Wed May 29 09:54:44 2013
+++ /src/robot/new_running/runner.py Wed May 29 10:09:59 2013
@@ -112,9 +112,9 @@
keywords = Keywords(test.keywords.normal, test.continue_on_failure)
self._context.start_test(result)
status = TestStatus(self._suite_status)
- if not test.name:
+ if not status.failures and not test.name:
status.test_failed('Test case name cannot be empty.',
test.critical)
- if not keywords:
+ if not status.failures and not keywords:
status.test_failed('Test case contains no keywords.',
test.critical)
self._run_setup(test.keywords.setup, status, result)
try:
--
---
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.
