2 new revisions:
Revision: 55fe9840fdc7
Branch: default
Author: Robot Framework Developers (robotframew...@gmail.com)
Date: Thu Jan 30 15:42:04 2014 UTC
Log: UG: Small enhancement to --rerunmerge docs....
http://code.google.com/p/robotframework/source/detail?r=55fe9840fdc7
Revision: 856d6f66453e
Branch: default
Author: Robot Framework Developers (robotframew...@gmail.com)
Date: Thu Jan 30 16:12:48 2014 UTC
Log: --rerunmerge: Test with other command line options....
http://code.google.com/p/robotframework/source/detail?r=856d6f66453e
==============================================================================
Revision: 55fe9840fdc7
Branch: default
Author: Robot Framework Developers (robotframew...@gmail.com)
Date: Thu Jan 30 15:42:04 2014 UTC
Log: UG: Small enhancement to --rerunmerge docs.
Update issue 1615
Code, tests, and docs reviewed with Tatu. Docs enhanced a little.
http://code.google.com/p/robotframework/source/detail?r=55fe9840fdc7
Modified:
/doc/userguide/RobotFrameworkUserGuide.html
/doc/userguide/src/ExecutingTestCases/PostProcessing.rst
=======================================
--- /doc/userguide/RobotFrameworkUserGuide.html Thu Jan 30 10:56:32 2014 UTC
+++ /doc/userguide/RobotFrameworkUserGuide.html Thu Jan 30 15:42:04 2014 UTC
@@ -11186,8 +11186,10 @@
pybot --rerunfailed original.xml --output rerun.xml tests # then
re-execute failing
rebot --rerunmerge original.xml rerun.xml # finally
merge results
</pre>
-<p>It is also possible to merge together more than two results, and all
other
-command line options work normally:</p>
+<p>The <span class="opt">--rerunmerge</span> option itself does not take
any arguments. Just using
+the option alone changes the way how <span class="prog">rebot</span>
combines two or more output
+files. All other command line options can be used with <span
class="opt">--rerunmerge</span>
+normally:</p>
<pre class="literal-block">
rebot --rerunmerge --name Merged --critical regression original.xml
rerun1.xml rerun2.xml
</pre>
@@ -17868,7 +17870,7 @@
<div class="footer">
<hr class="footer" />
<p>Generated by <a class="reference external"
href="http://docutils.sourceforge.net/rst.html";>reStructuredText</a>.
Syntax highlighting by <a class="reference external"
href="http://pygments.org/";>Pygments</a>.</p>
-<p>Generated on: 2014-01-30 10:54 UTC.
+<p>Generated on: 2014-01-30 15:39 UTC.
</p>
</div>
=======================================
--- /doc/userguide/src/ExecutingTestCases/PostProcessing.rst Thu Jan 30
10:56:18 2014 UTC
+++ /doc/userguide/src/ExecutingTestCases/PostProcessing.rst Thu Jan 30
15:42:04 2014 UTC
@@ -119,8 +119,10 @@
pybot --rerunfailed original.xml --output rerun.xml tests # then
re-execute failing
rebot --rerunmerge original.xml rerun.xml # finally
merge results
-It is also possible to merge together more than two results, and all other
-command line options work normally::
+The :opt:`--rerunmerge` option itself does not take any arguments. Just
using
+the option alone changes the way how :prog:`rebot` combines two or more
output
+files. All other command line options can be used with :opt:`--rerunmerge`
+normally::
rebot --rerunmerge --name Merged --critical regression original.xml
rerun1.xml rerun2.xml
==============================================================================
Revision: 856d6f66453e
Branch: default
Author: Robot Framework Developers (robotframew...@gmail.com)
Date: Thu Jan 30 16:12:48 2014 UTC
Log: --rerunmerge: Test with other command line options.
Update issue 1615
Status: Done
Added tests that other command line options, especially --flattenkeyword
that
is handled by ExecutionResult, work correctly.
http://code.google.com/p/robotframework/source/detail?r=856d6f66453e
Modified:
/atest/robot/rebot/rerun_merge.txt
=======================================
--- /atest/robot/rebot/rerun_merge.txt Thu Jan 30 09:46:39 2014 UTC
+++ /atest/robot/rebot/rerun_merge.txt Thu Jan 30 16:12:48 2014 UTC
@@ -55,6 +55,15 @@
... [ ERROR ] Merged test 'Suites.Fourth.Non-existing' is ignored
because it is not found from original result.\n
Merge should have been successful message 1=Expected
+Using other options
+ [Documentation] Test that other command line options works normally
with
+ ... --rerunmerge. Most importantly verify that options
handled
+ ... by ExecutionResult (--flattenkeyword) work correctly.
+ Rerun tests
+ Run merge --log log.html --flattenkeyword name:BuiltIn.Log --name
Custom
+ Merge should have been successful suite name=Custom
+ Log should have been created with all Log keywords flattened
+
*** Keywords **
Run original tests
Create Output With Robot ${ORIGINAL} --variable FAIL:YES
${TEST CASES}
@@ -92,14 +101,16 @@
Save XML ${xml} ${RERUN}
Run merge
- Run Rebot --rerunmerge ${ORIGINAL} ${RERUN}
+ [Arguments] ${options}=
+ Run Rebot --rerunmerge ${options} ${ORIGINAL} ${RERUN}
Run multi-merge
Run Rebot -R ${ORIGINAL} ${RERUN} ${RERUN 2}
Merge should have been successful
- [Arguments] ${status 1}=FAIL ${message 1}= ${status
2}=PASS ${message 2}=
- Should Be Equal ${SUITE.name} Suites
+ [Arguments] ${suite name}=Suites ${status 1}=FAIL ${message
1}=
+ ... ${status 2}=PASS ${message 2}=
+ Should Be Equal ${SUITE.name} ${suite name}
Should Contain Suites ${SUITE} @{ALL SUITES}
Should Contain Suites ${SUITE.suites[1]} @{SUB SUITES 1}
Should Contain Suites ${SUITE.suites[2]} @{SUB SUITES 2}
@@ -129,3 +140,8 @@
${message} = Create expected merge message ${EMPTY}
... FAIL This test was doomed to fail: again != NO PASS
${message}
[Return] ${message}
+
+Log should have been created with all Log keywords flattened
+ ${log} = Get File ${OUTDIR}/log.html
+ Should Not Contain ${log} "*<p>Logs the given message with the
given level.\\x3c/p>"
+ Should Contain ${log} "*<p>Logs the given message with the given
level.\\x3c/p>\\n<p><i><b>Keyword content
flattened.\\x3c/b>\\x3c/i>\\x3c/p>"
--
---
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 robotframework-commit+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
