2 new revisions:
Revision: aee82f67e10d
Branch: default
Author: jussi.ao.malinen
Date: Wed May 29 02:35:50 2013
Log: do not override the test message
http://code.google.com/p/robotframework/source/detail?r=aee82f67e10d
Revision: da615a135683
Branch: default
Author: jussi.ao.malinen
Date: Wed May 29 02:35:58 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=da615a135683
==============================================================================
Revision: aee82f67e10d
Branch: default
Author: jussi.ao.malinen
Date: Wed May 29 02:35:50 2013
Log: do not override the test message
http://code.google.com/p/robotframework/source/detail?r=aee82f67e10d
Modified:
/src/robot/new_running/runner.py
=======================================
--- /src/robot/new_running/runner.py Tue May 28 12:29:31 2013
+++ /src/robot/new_running/runner.py Wed May 29 02:35:50 2013
@@ -119,12 +119,12 @@
except ExecutionFailed, err:
status.test_failed(err)
result.status = status.status
- result.message = status.message
+ 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._run_teardown(test.keywords.teardown, status)
result.status = status.status
- result.message = status.message
+ result.message = status.message or result.message
result.endtime = utils.get_timestamp()
self._context.end_test(result)
==============================================================================
Revision: da615a135683
Branch: default
Author: jussi.ao.malinen
Date: Wed May 29 02:35:58 2013
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=da615a135683
--
---
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.
