2 new revisions:
Revision: 63e069f62399
Branch: default
Author: Pekka Klärck
Date: Wed Feb 19 07:06:22 2014 UTC
Log: Fixed reST tests when docutils not installed after changing
related er...
http://code.google.com/p/robotframework/source/detail?r=63e069f62399
Revision: a05bf26292c5
Branch: default
Author: Pekka Klärck
Date: Wed Feb 19 07:27:39 2014 UTC
Log: atests: shorten unnecessary long sleeps in data format tests.
saves ne...
http://code.google.com/p/robotframework/source/detail?r=a05bf26292c5
==============================================================================
Revision: 63e069f62399
Branch: default
Author: Pekka Klärck
Date: Wed Feb 19 07:06:22 2014 UTC
Log: Fixed reST tests when docutils not installed after changing
related error message
http://code.google.com/p/robotframework/source/detail?r=63e069f62399
Modified:
/atest/robot/parsing/data_formats/formats_resource.txt
/atest/robot/parsing/data_formats/rest.txt
/atest/robot/parsing/data_formats/rest_directives.txt
=======================================
--- /atest/robot/parsing/data_formats/formats_resource.txt Thu Oct 3
09:30:06 2013 UTC
+++ /atest/robot/parsing/data_formats/formats_resource.txt Wed Feb 19
07:06:22 2014 UTC
@@ -82,4 +82,3 @@
[Arguments] ${if kw} ${unless kw}
Run Keyword If "${DOCUTILS INSTALLED}" == "YES" ${if kw}
Run Keyword Unless "${DOCUTILS INSTALLED}" == "YES" ${unless kw}
-
=======================================
--- /atest/robot/parsing/data_formats/rest.txt Wed May 26 09:36:02 2010 UTC
+++ /atest/robot/parsing/data_formats/rest.txt Wed Feb 19 07:06:22 2014 UTC
@@ -6,7 +6,7 @@
*** Test Cases ***
One ReST
- [Setup]
+ [Setup] NONE
${status} ${msg} = Run Keyword And Ignore Error Run sample file and
check tests ${RESTDIR}${/}sample.rst
Run Keyword If "${DOCUTILS INSTALLED}" == "YES" and "${status}"
== "FAIL" FAIL ${msg}
Run Keyword Unless "${DOCUTILS INSTALLED}" == "YES" Clear error
should be given when docutils is not installed
@@ -24,6 +24,6 @@
*** Keywords ***
Clear Error Should Be Given When Docutils Is Not Installed
- ${stderr} = Get Stderr
- Should Match RegExp ${stderr} \\[ ERROR \\]
Parsing '.*[/\\\\]sample.rst' failed: Using reStructuredText test data
requires having 'docutils' module installed.\n \n Try --help for usage
information.\n
-
+ Stderr Should Match [ ERROR ] Parsing '*rest?sample.rst' failed:
+ ... Using reStructuredText test data requires having 'docutils'
+ ... module version 0.9 or newer installed.${USAGE TIP}
=======================================
--- /atest/robot/parsing/data_formats/rest_directives.txt Fri Sep 27
07:31:44 2013 UTC
+++ /atest/robot/parsing/data_formats/rest_directives.txt Wed Feb 19
07:06:22 2014 UTC
@@ -1,21 +1,16 @@
*** Settings ***
-Suite Setup Run keywords
-... Check is docutils installed
-Test Setup Run keywords
-... Make test non-critical and fail it if docutils is not
installed
+Suite Setup Check is docutils installed
Force Tags regression jybot pybot
Resource formats_resource.txt
*** Test Cases ***
-
One ReST using code-directive
- [Setup]
${status} ${msg} = Run Keyword And Ignore Error Run sample file and
check tests parsing${/}data_formats${/}rest_directives${/}sample.rst
Run Keyword If "${DOCUTILS INSTALLED}" == "YES" and "${status}"
== "FAIL" FAIL ${msg}
Run Keyword Unless "${DOCUTILS INSTALLED}" == "YES" Clear error
should be given when docutils is not installed
*** Keywords ***
-
Clear Error Should Be Given When Docutils Is Not Installed
- ${stderr} = Get Stderr
- Should Match RegExp ${stderr} \\[ ERROR \\]
Parsing '.*[/\\\\]sample.rst' failed: Using reStructuredText test data
requires having 'docutils' module installed.\n \n Try --help for usage
information.\n
+ Stderr Should Match [ ERROR ] Parsing '*rest_directives?sample.rst'
failed:
+ ... Using reStructuredText test data requires having 'docutils'
+ ... module version 0.9 or newer installed.${USAGE TIP}
==============================================================================
Revision: a05bf26292c5
Branch: default
Author: Pekka Klärck
Date: Wed Feb 19 07:27:39 2014 UTC
Log: atests: shorten unnecessary long sleeps in data format tests.
saves nearly 2s/suite x 6suite = 12s.
http://code.google.com/p/robotframework/source/detail?r=a05bf26292c5
Modified:
/atest/robot/parsing/data_formats/formats_resource.txt
/atest/testdata/parsing/data_formats/html/sample.html
/atest/testdata/parsing/data_formats/rest/sample.rst
/atest/testdata/parsing/data_formats/rest_directives/sample.rst
/atest/testdata/parsing/data_formats/robot/sample.robot
/atest/testdata/parsing/data_formats/tsv/sample.tsv
/atest/testdata/parsing/data_formats/txt/sample.txt
=======================================
--- /atest/robot/parsing/data_formats/formats_resource.txt Wed Feb 19
07:06:22 2014 UTC
+++ /atest/robot/parsing/data_formats/formats_resource.txt Wed Feb 19
07:27:39 2014 UTC
@@ -37,7 +37,9 @@
Check Test Tags Own Tags force1 force2 own1 own2
Check Test Tags Default Tags default1 force1 force2
${test} = Check Test Case Test Timeout
- Should Be Equal ${test.timeout} 1 second
+ Should Be Equal ${test.timeout} 10 milliseconds
+ ${test} = Check Test Case Keyword Timeout
+ Should Be Equal ${test.kws[0].timeout} 2 milliseconds
Check Test Doc Document Testing the metadata parsing.
${test} = Check Test Case Default Fixture
Should Be Equal ${test.setup} ${None}
=======================================
--- /atest/testdata/parsing/data_formats/html/sample.html Thu Oct 3
09:30:06 2013 UTC
+++ /atest/testdata/parsing/data_formats/html/sample.html Wed Feb 19
07:27:39 2014 UTC
@@ -469,7 +469,7 @@
<tr>
<td>Test Timeout</td>
<td>[Timeout]</td>
- <td>1second</td>
+ <td>0.01seconds</td>
<td></td>
<td></td>
</tr>
@@ -477,7 +477,7 @@
<td></td>
<td>[Document]</td>
<td>FAIL</td>
- <td>Test timeout 1 second exceeded.</td>
+ <td>Test timeout 10 milliseconds exceeded.</td>
<td></td>
</tr>
<tr>
@@ -498,7 +498,7 @@
<td>Keyword timeout</td>
<td>[Document]</td>
<td>FAIL</td>
- <td>Keyword timeout 1 second exceeded.</td>
+ <td>Keyword timeout 2 milliseconds exceeded.</td>
<td></td>
</tr>
<tr>
@@ -743,7 +743,7 @@
<tr>
<td>Timouted Keyword</td>
<td>[Timeout]</td>
- <td>1second</td>
+ <td>2ms</td>
<td></td>
<td></td>
</tr>
=======================================
--- /atest/testdata/parsing/data_formats/rest/sample.rst Thu Oct 3
09:30:06 2013 UTC
+++ /atest/testdata/parsing/data_formats/rest/sample.rst Wed Feb 19
07:27:39 2014 UTC
@@ -116,17 +116,19 @@
| Library Import| Directory Should| ${CURDIR}
| |
| | Not Be Empty |
| |
+---------------+-----------------+----------------------+--------------------+
-| Test Timeout | [Timeout] | 1second
| |
+| Test Timeout | [Timeout] | 0.01s
| |
+---------------+-----------------+----------------------+--------------------+
| | [Documentation] | FAIL | Test
timeout |
-| | | | 1 second
exceeded. |
+| | | | 10
milliseconds |
+| | | |
exceeded. |
+---------------+-----------------+----------------------+--------------------+
-| | Sleep | 2 seconds
| |
+| | Sleep | 1 second
| |
+---------------+-----------------+----------------------+--------------------+
| | |
| |
+---------------+-----------------+----------------------+--------------------+
| Keyword | [Documentation] | FAIL | Keyword
timeout |
-| Timeout | | | 1 second
exceeded. |
+| Timeout | | | 2
milliseconds |
+| | | |
exceeded. |
+---------------+-----------------+----------------------+--------------------+
| | Timeouted |
| |
| | Keyword |
| |
@@ -205,9 +207,9 @@
+---------------------+-----------------+---------------+------------------+--+
| | Equals | ${arg1} | ${arg2}
| |
+---------------------+-----------------+---------------+------------------+--+
-| Timeouted Keyword | [Timeout] | 1 second |
| |
+| Timeouted Keyword | [Timeout] | 2 ms |
| |
+---------------------+-----------------+---------------+------------------+--+
-| | Sleep | 2.0 s |
| |
+| | Sleep | 2 s |
| |
| | | |
| |
+---------------------+-----------------+---------------+------------------+--+
| | | |
| |
=======================================
--- /atest/testdata/parsing/data_formats/rest_directives/sample.rst Fri
Oct 4 07:59:00 2013 UTC
+++ /atest/testdata/parsing/data_formats/rest_directives/sample.rst Wed Feb
19 07:27:39 2014 UTC
@@ -89,11 +89,11 @@
Library Import Fail If Dir Empty ${CURDIR}
- Test Timeout [Timeout] 1second
- [Document] FAIL Test timeout 1 second exceeded.
+ Test Timeout [Timeout] 0.01s
+ [Document] FAIL Test timeout 10 milliseconds exceeded.
Sleep 2
- Keyword Timeout [Document] FAIL Keyword timeout 1 second exceeded.
+ Keyword Timeout [Document] FAIL Keyword timeout 2 milliseconds
exceeded.
Timeouted Keyword
Empty Rows
@@ -130,7 +130,7 @@
Another Keyword [Arguments] ${arg1} ${arg2}=something
Equals ${arg1} ${arg2}
- Timeouted Keyword [Timeout] 1second
+ Timeouted Keyword [Timeout] 2ms
Sleep 2
Keyword With No Arguments Log Hello world!
=======================================
--- /atest/testdata/parsing/data_formats/robot/sample.robot Thu Oct 3
09:30:06 2013 UTC
+++ /atest/testdata/parsing/data_formats/robot/sample.robot Wed Feb 19
07:27:39 2014 UTC
@@ -61,11 +61,11 @@
-Test Timeout [Timeout] 1second
- [Document] FAIL Test timeout 1 second exceeded.
- Sleep 2
+Test Timeout [Timeout] 0.01second
+ [Document] FAIL Test timeout 10 milliseconds exceeded.
+ Sleep 1
-Keyword Timeout [Document] FAIL Keyword timeout 1 second exceeded.
+Keyword Timeout [Document] FAIL Keyword timeout 2 milliseconds
exceeded.
Timeouted Keyword
@@ -110,7 +110,7 @@
Another Keyword [Arguments] ${arg1} ${arg2}=something
Equals ${arg1} ${arg2}
-Timeouted Keyword [Timeout] 1second
- Sleep 2
+Timeouted Keyword [Timeout] 2ms
+ Sleep 0.1
Keyword With No Arguments Log Hello world!
=======================================
--- /atest/testdata/parsing/data_formats/tsv/sample.tsv Thu Oct 3 09:30:06
2013 UTC
+++ /atest/testdata/parsing/data_formats/tsv/sample.tsv Wed Feb 19 07:27:39
2014 UTC
@@ -59,11 +59,11 @@
-Test Timeout [Timeout] 1second
- [Document] FAIL Test timeout 1 second exceeded.
+Test Timeout [Timeout] 0.01seconds
+ [Document] FAIL Test timeout 10 milliseconds exceeded.
Sleep 2
-Keyword Timeout [Document] FAIL Keyword timeout 1 second
exceeded.
+Keyword Timeout [Document] FAIL Keyword timeout 2 milliseconds
exceeded.
Timeouted Keyword
@@ -107,7 +107,7 @@
Another Keyword [Arguments] ${arg1} ${arg2}=something
Equals ${arg1} ${arg2}
-Timeouted Keyword [Timeout] 1second
+Timeouted Keyword [Timeout] 2ms
Sleep 2
Keyword With No Arguments Log Hello world!
=======================================
--- /atest/testdata/parsing/data_formats/txt/sample.txt Thu Oct 3 09:30:06
2013 UTC
+++ /atest/testdata/parsing/data_formats/txt/sample.txt Wed Feb 19 07:27:39
2014 UTC
@@ -62,11 +62,11 @@
-Test Timeout [Timeout] 1second
- [Document] FAIL Test timeout 1 second exceeded.
+Test Timeout [Timeout] 0.01s
+ [Document] FAIL Test timeout 10 milliseconds exceeded.
Sleep 2
-Keyword Timeout [Document] FAIL Keyword timeout 1 second exceeded.
+Keyword Timeout [Document] FAIL Keyword timeout 2 milliseconds
exceeded.
Timeouted Keyword
@@ -111,7 +111,7 @@
Another Keyword [Arguments] ${arg1} ${arg2}=something
Equals ${arg1} ${arg2}
-Timeouted Keyword [Timeout] 1second
+Timeouted Keyword [Timeout] 2 ms
Sleep 2
Keyword With No Arguments Log Hello world!
--
---
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.
