2 new revisions:
Revision: 4a7db5cf1f3f
Branch: default
Author: Pekka Klärck
Date: Thu Jan 30 09:15:34 2014 UTC
Log: test cleanup. tidy + writing all temp files to tempdir + names
http://code.google.com/p/robotframework/source/detail?r=4a7db5cf1f3f
Revision: 42d50a1dd67c
Branch: default
Author: Pekka Klärck
Date: Thu Jan 30 09:28:17 2014 UTC
Log: Started renaming --runfailed to --rerunfailed....
http://code.google.com/p/robotframework/source/detail?r=42d50a1dd67c
==============================================================================
Revision: 4a7db5cf1f3f
Branch: default
Author: Pekka Klärck
Date: Thu Jan 30 09:15:34 2014 UTC
Log: test cleanup. tidy + writing all temp files to tempdir + names
http://code.google.com/p/robotframework/source/detail?r=4a7db5cf1f3f
Modified:
/atest/robot/cli/runner/runfailed.txt
=======================================
--- /atest/robot/cli/runner/runfailed.txt Fri May 31 07:20:43 2013 UTC
+++ /atest/robot/cli/runner/runfailed.txt Thu Jan 30 09:15:34 2014 UTC
@@ -1,35 +1,39 @@
*** Settings ***
-Suite Setup Suite initialization
-Force Tags regression pybot jybot
-Resource atest_resource.txt
+Suite Setup Suite initialization
+Suite Teardown Remove Directory ${RERUN DIR} recursive
+Force Tags regression pybot jybot
+Resource atest_resource.txt
*** Variables ***
-${RUN FAILED FROM} %{TEMPDIR}${/}run-failed-output.xml
+${ORIG DIR} ${DATADIR}/cli/runfailed
+${RERUN DIR} %{TEMPDIR}/rerun-dir
+${SUITE DIR} ${RERUN DIR}/suite
+${RUN FAILED FROM} ${RERUN DIR}/rerun-output.xml
*** Test Cases ***
-Check that passing is not executed
- Run Keyword And Expect Error No test 'Passing' found* Check Test
Case Passing
+Passing is not re-executed
+ Run Keyword And Expect Error No test 'Passing' found* Check Test
Case Passing
-Check that failing is executed
- Check Test Case Failing
+Failing is re-executed
+ Check Test Case Failing
-Check that explicitly selected is executed
- Check Test Case Selected
+Failing from subsuite is executed
+ Check Test Case Really Failing
-Check that excluded failing is not executed
- Run Keyword And Expect Error No test 'Failing with tag' found* Check
Test Case Failing with tag
+Explicitly selected is executed
+ Check Test Case Selected
-Check that non-existing failing from output file is not executed
- Run Keyword And Expect Error No test 'Only in one suite' found*
Check Test Case Only in one suite
+Excluded failing is not executed
+ Run Keyword And Expect Error No test 'Failing with tag' found*
Check Test Case Failing with tag
-Check that failing test case from subsuite is executed
- Check Test Case Really Failing
+Non-existing failing from output file is not executed
+ Run Keyword And Expect Error No test 'Only in one suite' found*
Check Test Case Only in one suite
*** Keywords ***
Suite initialization
- Copy File ${DATADIR}/cli/runfailed/runfailed1.txt
${DATADIR}/cli/runfailed/suite/runfailed.txt
- Run Tests ${EMPTY} cli/runfailed/suite
- Copy File ${OUTFILE} ${RUN FAILED FROM}
- Copy File ${DATADIR}/cli/runfailed/runfailed2.txt
${DATADIR}/cli/runfailed/suite/runfailed.txt
- Run Tests --runfailed ${RUN FAILED FROM} --test Selected --exclude
tag cli/runfailed/suite
- [Teardown] Remove Files ${RUN FAILED FROM}
${DATADIR}/cli/runfailed/suite/runfailed.txt
+ Copy Directory ${ORIG DIR}/suite ${SUITE DIR}
+ Copy File ${ORIG DIR}/runfailed1.txt ${SUITE DIR}/runfailed.txt
+ Run Tests ${EMPTY} ${SUITE DIR}
+ Copy File ${OUTFILE} ${RUN FAILED FROM}
+ Copy File ${ORIG DIR}/runfailed2.txt ${SUITE DIR}/runfailed.txt
+ Run Tests --runfailed ${RUN FAILED FROM} --test Selected --exclude
tag ${SUITE DIR}
==============================================================================
Revision: 42d50a1dd67c
Branch: default
Author: Pekka Klärck
Date: Thu Jan 30 09:28:17 2014 UTC
Log: Started renaming --runfailed to --rerunfailed.
New issue
Summary: Rename --runfailed to --rerunfailed
Owner: pekka.klarck
Labels: Target-2.8.4 Type-Enhancement Priority-Low
--rerunfailed is more explicit name and also consistent with related
--rerunmerge (issue 1615).
At this point we'll just add --rerunfailed option as an alias for
--runfailed. New issue needs to be submitted about actually deprecating
--runfailed in RF 2.9. Notice also that the short option -R works like
earlier.
This commit ought to take care of implementation, tests and --help text.
Still need to document this in the User Guide.
http://code.google.com/p/robotframework/source/detail?r=42d50a1dd67c
Modified:
/atest/robot/cli/runner/runfailed.txt
/src/robot/conf/settings.py
/src/robot/run.py
=======================================
--- /atest/robot/cli/runner/runfailed.txt Thu Jan 30 09:15:34 2014 UTC
+++ /atest/robot/cli/runner/runfailed.txt Thu Jan 30 09:28:17 2014 UTC
@@ -29,6 +29,17 @@
Non-existing failing from output file is not executed
Run Keyword And Expect Error No test 'Only in one suite' found*
Check Test Case Only in one suite
+--runfailed still works without warnings
+ [Documentation] --runfailed should be deprecated in RF 2.9 and
removed later
+ Run Tests --runfailed ${RUN FAILED FROM} --test Selected --exclude
tag ${SUITE DIR}
+ Should Be Empty ${ERRORS}
+ Run Keyword And Expect Error No test 'Passing' found* Check Test
Case Passing
+ Check Test Case Failing
+ Check Test Case Really Failing
+ Check Test Case Selected
+ Run Keyword And Expect Error No test 'Failing with tag' found*
Check Test Case Failing with tag
+ Run Keyword And Expect Error No test 'Only in one suite' found*
Check Test Case Only in one suite
+
*** Keywords ***
Suite initialization
Copy Directory ${ORIG DIR}/suite ${SUITE DIR}
@@ -36,4 +47,4 @@
Run Tests ${EMPTY} ${SUITE DIR}
Copy File ${OUTFILE} ${RUN FAILED FROM}
Copy File ${ORIG DIR}/runfailed2.txt ${SUITE DIR}/runfailed.txt
- Run Tests --runfailed ${RUN FAILED FROM} --test Selected --exclude
tag ${SUITE DIR}
+ Run Tests --rerunfailed ${RUN FAILED FROM} --test Selected
--exclude tag ${SUITE DIR}
=======================================
--- /src/robot/conf/settings.py Wed Jan 29 15:30:44 2014 UTC
+++ /src/robot/conf/settings.py Thu Jan 30 09:28:17 2014 UTC
@@ -28,7 +28,8 @@
'Doc' : ('doc', None),
'Metadata' : ('metadata', []),
'TestNames' : ('test', []),
- 'RunFailed' : ('runfailed', 'NONE'),
+ 'ReRunFailed' : ('rerunfailed', 'NONE'),
+ 'DeprecatedRunFailed': ('runfailed', 'NONE'),
'SuiteNames' : ('suite', []),
'SetTag' : ('settag', []),
'Include' : ('include', []),
@@ -73,7 +74,7 @@
if default == [] and isinstance(value, basestring):
value = [value]
self[name] = self._process_value(name, value)
- self['TestNames'] += self['RunFailed']
+ self['TestNames'] += self['ReRunFailed'] or
self['DeprecatedRunFailed']
if self['DeprecatedXUnit']:
self['XUnit'] = self['DeprecatedXUnit']
@@ -83,7 +84,7 @@
self._opts[name] = value
def _process_value(self, name, value):
- if name == 'RunFailed':
+ if name in ['ReRunFailed', 'DeprecatedRunFailed']:
return gather_failed_tests(value)
if name == 'LogLevel':
return self._process_log_level(value)
=======================================
--- /src/robot/run.py Sat Jan 25 23:51:09 2014 UTC
+++ /src/robot/run.py Thu Jan 30 09:28:17 2014 UTC
@@ -106,9 +106,10 @@
-e --exclude tag * Select test cases not to run by tag. These tests
are
not run even if included with --include. Tags are
matched using the rules explained with --include.
- -R --runfailed output Select failed tests from an earlier output file
to be
+ -R --rerunfailed output Select failed tests from an earlier output file
to be
re-executed. Equivalent to selecting same tests
individually using --test option.
+ --runfailed output Deprecated since RF 2.8.4. Use --rerunfailed
instead.
-c --critical tag * Tests having given tag are considered critical.
If no
critical tags are set, all tags are critical.
Tags
can be given as a pattern like with --include.
--
---
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.
