Revision: fc0824d8ecc4
Branch: default
Author: jussi.ao.malinen
Date: Wed May 29 07:46:41 2013
Log: fix set test message tests to reflect new behavior (failures
override set test message) and fixed bug on test message for teardown
http://code.google.com/p/robotframework/source/detail?r=fc0824d8ecc4
Modified:
/atest/robot/standard_libraries/builtin/set_test_message.txt
/atest/testdata/standard_libraries/builtin/set_test_message.txt
/src/robot/new_running/runner.py
=======================================
--- /atest/robot/standard_libraries/builtin/set_test_message.txt Tue Jan 29
02:23:00 2013
+++ /atest/robot/standard_libraries/builtin/set_test_message.txt Wed May 29
07:46:41 2013
@@ -30,13 +30,13 @@
Failure Resets Set Message
Check Test Case ${TEST NAME}
-Set Message To Failed Test On Teardown
+Setting Message To Failed Test On Teardown Does Not Work
Check Test Case ${TEST NAME}
Setting Message In Test Body After Continuable Failure Has No Effect
Check Test Case ${TEST NAME}
-Setting Message In Teardown After Continuable Failure Works
+Setting Message In Teardown After Continuable Failure Does Not Work
Check Test Case ${TEST NAME}
Set Message In Body and Fail In Teardown
=======================================
--- /atest/testdata/standard_libraries/builtin/set_test_message.txt Tue Jan
29 02:23:00 2013
+++ /atest/testdata/standard_libraries/builtin/set_test_message.txt Wed May
29 07:46:41 2013
@@ -31,10 +31,10 @@
Fail Fail Message
[Teardown] Should Be Equal ${TEST MESSAGE} Fail Message
-Set Message To Failed Test On Teardown
- [Documentation] FAIL Teardown Message
- Fail Message That Will Be Ignored
- [Teardown] Set Test Message Teardown Message
+Setting Message To Failed Test On Teardown Does Not Work
+ [Documentation] FAIL Body Message
+ Fail Body Message
+ [Teardown] Set Test Message Message That Will Be Ignored
Setting Message In Test Body After Continuable Failure Has No Effect
[Documentation] FAIL Failure Message
@@ -42,30 +42,23 @@
Set Test Message Ignored Message
[Teardown] Should Be Equal ${TEST MESSAGE} Failure Message
-Setting Message In Teardown After Continuable Failure Works
- [Documentation] FAIL Set Message
+Setting Message In Teardown After Continuable Failure Does Not Work
+ [Documentation] FAIL Failure Message
Run Keyword And Continue On Failure Fail Failure Message
[Teardown] Set Test Message Set Message
Set Message In Body and Fail In Teardown
- [Documentation] FAIL Message Before Teardown\n\nAlso teardown
failed:\n
- ... Failing Teardown Message
+ [Documentation] FAIL Teardown failed:\nFailing Teardown Message
Set Test Message Message Before Teardown
[Teardown] Fail Failing Teardown Message
Set Message In Teardown And Fail Afterwards
- [Documentation] FAIL My message before failure
- ...
- ... Also teardown failed:
- ... My failure after message
+ [Documentation] FAIL Teardown failed:\nMy failure after message
No Operation
[Teardown] Set Message In Teardown And Fail Afterwards
Fail In Teardown And Set Message Afterwards
- [Documentation] FAIL My message after failure
- ...
- ... Also teardown failed:
- ... My failure before message
+ [Documentation] FAIL Teardown failed:\nMy failure before message
No Operation
[Teardown] Fail In Teardown And Set Message Afterwards
=======================================
--- /src/robot/new_running/runner.py Wed May 29 07:18:32 2013
+++ /src/robot/new_running/runner.py Wed May 29 07:46:41 2013
@@ -130,7 +130,7 @@
result.status = status.status
result.message = status.message or result.message
if status.teardown_allowed:
- self._context.set_test_status_before_teardown(status.message,
status.status) # TODO: This is fugly
+ self._context.set_test_status_before_teardown(result.message,
status.status) # TODO: This is fugly
self._run_teardown(test.keywords.teardown, status, result)
result.status = status.status
result.message = status.message or result.message
--
---
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.
