Revision: 2522
Author: pekka.klarck
Date: Tue Feb 23 07:25:40 2010
Log: Fixed tests after timeout format change in r2521. Hope my 'sed -i'
skills were good enough to catch all the places...
http://code.google.com/p/robotframework/source/detail?r=2522
Modified:
/trunk/atest/robot/core/error_msg_and_details.html
/trunk/atest/robot/core/test_suite_init_file.html
/trunk/atest/robot/core/timeouts.html
/trunk/atest/robot/parsing/data_formats/formats_resource.html
/trunk/atest/testdata/core/error_msg_and_details.html
/trunk/atest/testdata/core/metadata.html
/trunk/atest/testdata/core/test_suite_dir_with_init_file/sub_suite_with_init_file/test_cases_1.html
/trunk/atest/testdata/core/test_suite_dir_with_init_file/sub_suite_without_init_file/test_cases_1.html
/trunk/atest/testdata/core/test_suite_dir_with_init_file/test_cases_1.html
/trunk/atest/testdata/core/timeouts.html
/trunk/atest/testdata/parsing/data_formats/html/sample.html
/trunk/atest/testdata/parsing/data_formats/rest/sample.rst
/trunk/atest/testdata/parsing/data_formats/tsv/sample.tsv
/trunk/atest/testdata/parsing/data_formats/txt/sample.txt
/trunk/atest/testdata/standard_libraries/builtin/run_keyword.html
/trunk/atest/testdata/standard_libraries/builtin/wait_until_keyword_succeeds.txt
/trunk/utest/running/test_timeouts.py
=======================================
--- /trunk/atest/robot/core/error_msg_and_details.html Fri Nov 21 03:35:17
2008
+++ /trunk/atest/robot/core/error_msg_and_details.html Tue Feb 23 07:25:40
2010
@@ -207,7 +207,7 @@
<tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Exception
Type is Included In Non-Generic Java
Failures</td><td>[Tags]</td><td>jybot</td><td></td><td></td></tr><tr><td></td><td>Verify
Test Case And Error In Log</td><td>Non Generic Failure In
Java </td><td>
ArrayStoreException: My
message</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Message
Is Got Correctly If Python Exception Has Non-String Message</td><td>Verify
Test Case And Error In Log</td><td>Python Exception With Non-String
Message</td><td>ValueError: ['a', 'b', (1, 2), None, {'a':
1}]</td><td>1</td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Message
Is Got Correctly If Python Exception Has 'None' Message</td><td>Verify Test
Case And Error In Log</td><td>Python Exception With 'None'
Message</td><td>AssertionError</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Message
Is Got Correctly If Java Exception Has 'null'
Message</td><td>[Tags]</td><td>jybot</td><td></td><td></td></tr><tr><td></td><td>Verify
Test Case And Error In Log</td><td>Java Exception With 'null'
Message</td><td>
ArrayStoreException</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Message
And Internal Trace Are Removed From Details When Exception In
Library</td><td>${tc} =</td><td>Verify Test Case And Error In
Log</td><td>Generic Failure</td><td>foo !=
bar</td></tr><tr><td></td><td>Verify Python
Traceback</td><td>${tc.kws[0].msgs[1]}</td><td>exception</td><td>raise
exception, msg</td></tr><tr><td></td><td>${tc} =</td><td>Verify Test Case
And Error In Log</td><td>Non Generic
Failure </td><td>FloatingPointError: Too Large A
Number !!</td></tr><tr><td></td><td>Verify Python
Traceback</td><td>${tc.kws[0].msgs[1]}</td><td>exception</td><td>raise
exception,
msg</td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Message
And Internal Trace Are Removed From Details When Exception In Java
Library</td><td>[Tags]</td><td>jybot</td><td></td><td></td></tr><tr><td></td><td>${tc}
=</td><td>Verify Test Case And Error In Log</td><td>Generic Failure In
Java</td><td>bar !=
foo</td></tr><tr><td></td><td>...</td><td>2</td><td></td><td></td></tr><tr><td></td><td>Verify
Java Stack
Trace</td><td>${tc.kws[2].msgs[1]}</td><td>java.lang.AssertionError:
\</td><td>ExampleJavaLibrary.checkInHashtable</td></tr><tr><td></td><td>${tc}
=</td><td>Verify Test Case And Error In Log</td><td>Non Generic Failure In
Java </td><td>ArrayStoreException: My
message</td></tr><tr><td></td><td>Verify Java Stack
Trace</td><td>${tc.kws[0].msgs[1]}</td><td>java.lang.ArrayStoreException:
\</td><td>ExampleJavaLibrary.exception</td></tr><tr><td></td><td>...</td><td>ExampleJavaLibrary.javaException</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Message
and Internal Trace Are Removed From Details When Exception In External
Code</td><td>${tc} =</td><td>Verify Test Case And Error In
Log</td><td>External Failure</td><td>UnboundLocalError: Raised from an
external object!</td></tr><tr><td></td><td>Verify Python
Traceback</td><td>${tc.kws[0].msgs[1]}</td><td>external_exception</td><td>ObjectToReturn('failure').exception(name,
msg)</td></tr><tr><td></td><td>...</td><td>exception</td><td>raise
exception,
msg</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Message
and Internal Trace Are Removed From Details When Exception In External
Java
Code</td><td>[Tags]</td><td>jybot</td><td></td><td></td></tr><tr><td></td><td>${tc}
=</td><td>Verify Test Case And Error In Log</td><td>External Failure In
Java</td><td>IllegalArgumentException: Illegal initial capacity:
-1</td></tr>
- <tr><td></td><td>Verify Java Stack
Trace</td><td>${tc.kws[0].msgs[1]}</td><td>java.lang.IllegalArgumentException:
\</td><td>java.util.HashMap.</td></tr><tr><td></td><td>...</td><td>java.util.HashMap.</td><td>JavaObject.exception</td><td>ExampleJavaLibrary</td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>No
Details For Timeouts</td><td>Verify Test Case, Error In Log And No
Details</td><td>Timeout Expires</td><td>Test timeout 200ms
exceeded</td><td>${1}</td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>No
Details For Non Existing Keywords</td><td>Verify Test Case, Error In Log
And No Details</td><td>Non existing Keyword</td><td>No keyword with
name 'Non Existing Keyword'
found.</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>No
Details For Non Existing Variables</td><td>Verify Test Case, Error In Log
And No Details</td><td>Non Existing Scalar Variable</td><td>Non-existing
variable '\${non existing}'</td><td></td></tr><tr><td></td><td>Verify Test
Case, Error In Log And No Details</td><td>Non Existing List
Variable</td><td>Non-existing variable '\...@{non
existing}'</td><td></td></tr><tr><td><br></td><td></td><td></td><td></td><td></td></tr><tr>
+ <tr><td></td><td>Verify Java Stack
Trace</td><td>${tc.kws[0].msgs[1]}</td><td>java.lang.IllegalArgumentException:
\</td><td>java.util.HashMap.</td></tr><tr><td></td><td>...</td><td>java.util.HashMap.</td><td>JavaObject.exception</td><td>ExampleJavaLibrary</td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>No
Details For Timeouts</td><td>Verify Test Case, Error In Log And No
Details</td><td>Timeout Expires</td><td>Test timeout 200 milliseconds
exceeded.</td><td>${1}</td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>No
Details For Non Existing Keywords</td><td>Verify Test Case, Error In Log
And No Details</td><td>Non existing Keyword</td><td>No keyword with
name 'Non Existing Keyword'
found.</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>No
Details For Non Existing Variables</td><td>Verify Test Case, Error In Log
And No Details</td><td>Non Existing Scalar Variable</td><td>Non-existing
variable '\${non existing}'</td><td></td></tr><tr><td></td><td>Verify Test
Case, Error In Log And No Details</td><td>Non Existing List
Variable</td><td>Non-existing variable '\...@{non
existing}'</td><td></td></tr><tr><td><br></td><td></td><td></td><td></td><td></td></tr><tr>
<td></td>
=======================================
--- /trunk/atest/robot/core/test_suite_init_file.html Fri Apr 3 10:07:42
2009
+++ /trunk/atest/robot/core/test_suite_init_file.html Tue Feb 23 07:25:40
2010
@@ -759,8 +759,7 @@
Test Timeout</td>
<td align="undefined" valign="undefined">TC1
No Metadata</td>
-<td align="undefined" valign="undefined">1h
-2min 3s</td>
+<td align="undefined" valign="undefined">1 hour 2 minutes 3 seconds</td>
<td></td>
</tr>
<tr>
@@ -769,7 +768,7 @@
Test Timeout</td>
<td align="undefined" valign="undefined">TC1
Timeout</td>
-<td align="undefined" valign="undefined">1s</td>
+<td align="undefined" valign="undefined">1 second</td>
<td></td>
</tr>
<tr>
@@ -778,8 +777,7 @@
Test Timeout</td>
<td align="undefined" valign="undefined">TC2
No Metadata</td>
-<td align="undefined" valign="undefined">13d
-6h 50min</td>
+<td align="undefined" valign="undefined">13 days 6 hours 50 minutes</td>
<td></td>
</tr>
<tr>
@@ -788,7 +786,7 @@
Test Timeout</td>
<td align="undefined" valign="undefined">TC2
Timeout</td>
-<td align="undefined" valign="undefined">1h</td>
+<td align="undefined" valign="undefined">1 hour</td>
<td></td>
</tr>
<tr>
@@ -797,8 +795,7 @@
Test Timeout</td>
<td align="undefined" valign="undefined">S1TC1
No Metadata</td>
-<td align="undefined" valign="undefined">4h
-5min 6s</td>
+<td align="undefined" valign="undefined">4 hours 5 minutes 6 seconds</td>
<td align="undefined" valign="undefined"></td>
</tr>
<tr>
@@ -807,7 +804,7 @@
Test Timeout</td>
<td align="undefined" valign="undefined">S1TC1
Timeout</td>
-<td align="undefined" valign="undefined">1s</td>
+<td align="undefined" valign="undefined">1 second</td>
<td align="undefined" valign="undefined"></td>
</tr>
<tr>
@@ -816,8 +813,7 @@
Test Timeout</td>
<td align="undefined" valign="undefined">S1TC2
No Metadata</td>
-<td align="undefined" valign="undefined">1min
-52s</td>
+<td align="undefined" valign="undefined">1 minute 52 seconds</td>
<td align="undefined" valign="undefined"></td>
</tr>
<tr>
@@ -833,8 +829,7 @@
Test Timeout</td>
<td align="undefined" valign="undefined">S1TC2
Tags</td>
-<td align="undefined" valign="undefined">1min
-52s</td>
+<td align="undefined" valign="undefined">1 minute 52 seconds</td>
<td></td>
</tr>
<tr>
@@ -843,7 +838,7 @@
Test Timeout</td>
<td align="undefined" valign="undefined">S1TC2
Timeout</td>
-<td align="undefined" valign="undefined">1d</td>
+<td align="undefined" valign="undefined">1 day</td>
<td align="undefined" valign="undefined"></td>
</tr>
<tr>
@@ -852,8 +847,7 @@
Test Timeout</td>
<td align="undefined" valign="undefined">S2TC1
No Metadata</td>
-<td align="undefined" valign="undefined">7h
-8min 9s</td>
+<td align="undefined" valign="undefined">7 hours 8 minutes 9 seconds</td>
<td align="undefined" valign="undefined"></td>
</tr>
<tr>
@@ -862,7 +856,7 @@
Test Timeout</td>
<td align="undefined" valign="undefined">S2TC1
Timeout</td>
-<td align="undefined" valign="undefined">1s</td>
+<td align="undefined" valign="undefined">1 second</td>
<td align="undefined" valign="undefined"></td>
</tr>
<tr>
@@ -871,8 +865,7 @@
Test Timeout</td>
<td align="undefined" valign="undefined">S2TC2
No Metadata</td>
-<td align="undefined" valign="undefined">13d
-6h 50min</td>
+<td align="undefined" valign="undefined">13 days 6 hours 50 minutes</td>
<td align="undefined" valign="undefined"></td>
</tr>
<tr>
@@ -881,7 +874,7 @@
Test Timeout</td>
<td align="undefined" valign="undefined">S2TC2
Timeout</td>
-<td align="undefined" valign="undefined">1d</td>
+<td align="undefined" valign="undefined">1 day</td>
<td align="undefined" valign="undefined"></td>
</tr>
</tbody>
=======================================
--- /trunk/atest/robot/core/timeouts.html Sat May 31 09:57:24 2008
+++ /trunk/atest/robot/core/timeouts.html Tue Feb 23 07:25:40 2010
@@ -4397,7 +4397,7 @@
- <td align="undefined" valign="undefined">2d 4h 56min 18s</td>
+ <td align="undefined" valign="undefined">2 days 4 hours 56 minutes
18 seconds</td>
=======================================
--- /trunk/atest/robot/parsing/data_formats/formats_resource.html Fri Aug
14 05:04:30 2009
+++ /trunk/atest/robot/parsing/data_formats/formats_resource.html Tue Feb
23 07:25:40 2010
@@ -328,7 +328,7 @@
<td class="name"></td>
<td>Should Be Equal</td>
<td>${test.timeout}</td>
-<td>1s</td>
+<td>1 second</td>
<td></td>
</tr>
<tr>
=======================================
--- /trunk/atest/testdata/core/error_msg_and_details.html Sat May 31
09:57:24 2008
+++ /trunk/atest/testdata/core/error_msg_and_details.html Tue Feb 23
07:25:40 2010
@@ -213,7 +213,7 @@
<td align="undefined" valign="undefined">IllegalArgumentException:
Illegal initial capacity: -1</td>
<td align="undefined" valign="undefined"></td>
</tr>
- <tr><td></td><td>External Java
Exception</td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Timeout
Expires</td><td>[ Documentation ]</td><td>FAIL</td><td>Test timeout 200ms
exceeded</td><td></td></tr><tr><td></td><td>[ Timeout ]</td><td>200
ms</td><td></td><td></td></tr><tr><td></td><td>Sleep</td><td>1</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Non
existing Keyword</td><td>[ Documentation ]</td><td>FAIL</td><td>No keyword
with name 'Non Existing Keyword'
found.</td><td></td></tr><tr><td></td><td>Non Existing
Keyword</td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Non
Existing Scalar Variable</td><td>[ Documentation
]</td><td>FAIL</td><td>Non-existing variable '\${non
existing}'</td><td></td></tr><tr><td></td><td>Log</td><td>${non
existing}</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Non
Existing List Variable</td><td>[ Documentation
]</td><td>FAIL</td><td>Non-existing variable '\...@{non
existing}'</td><td></td></tr><tr><td></td><td>Log Many</td><td>@{non
existing}</td><td></td><td></td></tr>
+ <tr><td></td><td>External Java
Exception</td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Timeout
Expires</td><td>[ Documentation ]</td><td>FAIL</td><td>Test timeout 200
milliseconds exceeded.</td><td></td></tr><tr><td></td><td>[ Timeout
]</td><td>200
ms</td><td></td><td></td></tr><tr><td></td><td>Sleep</td><td>1</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Non
existing Keyword</td><td>[ Documentation ]</td><td>FAIL</td><td>No keyword
with name 'Non Existing Keyword'
found.</td><td></td></tr><tr><td></td><td>Non Existing
Keyword</td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Non
Existing Scalar Variable</td><td>[ Documentation
]</td><td>FAIL</td><td>Non-existing variable '\${non
existing}'</td><td></td></tr><tr><td></td><td>Log</td><td>${non
existing}</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Non
Existing List Variable</td><td>[ Documentation
]</td><td>FAIL</td><td>Non-existing variable '\...@{non
existing}'</td><td></td></tr><tr><td></td><td>Log Many</td><td>@{non
existing}</td><td></td><td></td></tr>
</tbody>
</table>
=======================================
--- /trunk/atest/testdata/core/metadata.html Wed Apr 1 08:17:26 2009
+++ /trunk/atest/testdata/core/metadata.html Tue Feb 23 07:25:40 2010
@@ -1369,7 +1369,7 @@
- <td align="undefined" valign="undefined">500ms</td>
+ <td align="undefined" valign="undefined">500 milliseconds</td>
@@ -3828,7 +3828,7 @@
<td align="undefined" valign="undefined">Test
-timeout @{test_timeout}[0] exceeded</td>
+timeout @{test_timeout}[0] exceeded.</td>
@@ -3963,8 +3963,7 @@
- <td align="undefined" valign="undefined">Test timeout 1s
-exceeded</td>
+ <td align="undefined" valign="undefined">Test timeout 1 second
exceeded.</td>
@@ -4284,8 +4283,7 @@
- <td align="undefined" valign="undefined">Test timeout 1s
-exceeded</td>
+ <td align="undefined" valign="undefined">Test timeout 1 second
exceeded.</td>
@@ -6369,8 +6367,7 @@
- <td align="undefined" valign="undefined">Keyword timeout 1s
-exceeded</td>
+ <td align="undefined" valign="undefined">Keyword timeout 1 second
exceeded.</td>
@@ -6552,7 +6549,7 @@
<td align="undefined" valign="undefined">Keyword
-timeout @{keyword_timeout}[0] exceeded</td>
+timeout @{keyword_timeout}[0] exceeded.</td>
=======================================
---
/trunk/atest/testdata/core/test_suite_dir_with_init_file/sub_suite_with_init_file/test_cases_1.html
Sat May 31 09:57:24 2008
+++
/trunk/atest/testdata/core/test_suite_dir_with_init_file/sub_suite_with_init_file/test_cases_1.html
Tue Feb 23 07:25:40 2010
@@ -1542,7 +1542,7 @@
- <td align="undefined" valign="undefined">Test timeout 1s
exceeded</td>
+ <td align="undefined" valign="undefined">Test timeout 1 second
exceeded.</td>
=======================================
---
/trunk/atest/testdata/core/test_suite_dir_with_init_file/sub_suite_without_init_file/test_cases_1.html
Sat May 31 09:57:24 2008
+++
/trunk/atest/testdata/core/test_suite_dir_with_init_file/sub_suite_without_init_file/test_cases_1.html
Tue Feb 23 07:25:40 2010
@@ -1542,7 +1542,7 @@
- <td align="undefined" valign="undefined">Test timeout 1s
exceeded</td>
+ <td align="undefined" valign="undefined">Test timeout 1 second
exceeded.</td>
=======================================
---
/trunk/atest/testdata/core/test_suite_dir_with_init_file/test_cases_1.html
Sat May 31 09:57:24 2008
+++
/trunk/atest/testdata/core/test_suite_dir_with_init_file/test_cases_1.html
Tue Feb 23 07:25:40 2010
@@ -1542,7 +1542,7 @@
- <td align="undefined" valign="undefined">Test timeout 1s
exceeded</td>
+ <td align="undefined" valign="undefined">Test timeout 1 second
exceeded.</td>
=======================================
--- /trunk/atest/testdata/core/timeouts.html Sat May 31 09:57:24 2008
+++ /trunk/atest/testdata/core/timeouts.html Tue Feb 23 07:25:40 2010
@@ -2293,7 +2293,7 @@
- <tr><td>Passing</td><td>No
Operation</td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td
align="undefined" valign="undefined">Sleeping But Passing</td><td
align="undefined" valign="undefined">Sleep Without Logging</td><td
align="undefined"
valign="undefined">0.1</td><td></td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Sleep Without Logging</td><td
align="undefined"
valign="undefined">0.1</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td
align="undefined" valign="undefined">Failing Before Timeout</td><td
align="undefined" valign="undefined">[ Document ]</td><td align="undefined"
valign="undefined">FAIL</td><td align="undefined"
valign="undefined">Failure before
timeout</td><td></td></tr><tr><td></td><td align="undefined"
valign="undefined">Fail</td><td align="undefined"
valign="undefined">Failure before
timeout</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td
align="undefined" valign="undefined">Sleeping and Timeouting</td><td
align="undefined" valign="undefined">[ Document ]</td><td align="undefined"
valign="undefined">FAIL</td><td align="undefined" valign="undefined">Test
timeout 4s exceeded</td><td></td></tr><tr><td></td><td>Sleep Without
Logging</td><td>10</td><td></td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Fail</td><td align="undefined"
valign="undefined">This should not be
executed</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td
align="undefined" valign="undefined">Total Time Too Long</td><td
align="undefined" valign="undefined">[ Document ]</td><td
align="undefined" valign="undefined">FAIL</td><td align="undefined"
valign="undefined">Test timeout 500ms
exceeded</td><td></td></tr><tr><td></td><td align="undefined"
valign="undefined">[ Time Out ]</td><td align="undefined"
valign="undefined">0.5 sec</td><td></td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Sleep Without Logging</td><td
align="undefined"
valign="undefined">0.2</td><td></td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Sleep Without Logging</td><td
align="undefined"
valign="undefined">0.2</td><td></td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Sleep Without Logging</td><td
align="undefined"
valign="undefined">0.2</td><td></td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Fail</td><td align="undefined"
valign="undefined">This should not be
executed</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td
align="undefined" valign="undefined">Looping Forever and Timeouting</td><td
align="undefined" valign="undefined">[ Document ]</td><td align="undefined"
valign="undefined">FAIL</td><td align="undefined" valign="undefined">Test
timeout 333ms exceeded</td><td></td></tr><tr><td></td><td align="undefined"
valign="undefined">[timeout]</td><td align="undefined"
valign="undefined">333
millisecond</td><td></td><td></td></tr><tr><td></td><td>Loop
Forever</td><td></td><td></td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Fail</td><td align="undefined"
valign="undefined">This should not be
executed</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
+ <tr><td>Passing</td><td>No
Operation</td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td
align="undefined" valign="undefined">Sleeping But Passing</td><td
align="undefined" valign="undefined">Sleep Without Logging</td><td
align="undefined"
valign="undefined">0.1</td><td></td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Sleep Without Logging</td><td
align="undefined"
valign="undefined">0.1</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td
align="undefined" valign="undefined">Failing Before Timeout</td><td
align="undefined" valign="undefined">[ Document ]</td><td align="undefined"
valign="undefined">FAIL</td><td align="undefined"
valign="undefined">Failure before
timeout</td><td></td></tr><tr><td></td><td align="undefined"
valign="undefined">Fail</td><td align="undefined"
valign="undefined">Failure before
timeout</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td
align="undefined" valign="undefined">Sleeping and Timeouting</td><td
align="undefined" valign="undefined">[ Document ]</td><td align="undefined"
valign="undefined">FAIL</td><td align="undefined" valign="undefined">Test
timeout 4 seconds exceeded.</td><td></td></tr><tr><td></td><td>Sleep
Without Logging</td><td>10</td><td></td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Fail</td><td align="undefined"
valign="undefined">This should not be
executed</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td
align="undefined" valign="undefined">Total Time Too Long</td><td
align="undefined" valign="undefined">[ Document ]</td><td
align="undefined" valign="undefined">FAIL</td><td align="undefined"
valign="undefined">Test timeout 500 milliseconds
exceeded.</td><td></td></tr><tr><td></td><td align="undefined"
valign="undefined">[ Time Out ]</td><td align="undefined"
valign="undefined">0.5 sec</td><td></td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Sleep Without Logging</td><td
align="undefined"
valign="undefined">0.2</td><td></td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Sleep Without Logging</td><td
align="undefined"
valign="undefined">0.2</td><td></td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Sleep Without Logging</td><td
align="undefined"
valign="undefined">0.2</td><td></td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Fail</td><td align="undefined"
valign="undefined">This should not be
executed</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td
align="undefined" valign="undefined">Looping Forever and Timeouting</td><td
align="undefined" valign="undefined">[ Document ]</td><td align="undefined"
valign="undefined">FAIL</td><td align="undefined" valign="undefined">Test
timeout 333 milliseconds exceeded.</td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">[timeout]</td><td align="undefined"
valign="undefined">333
millisecond</td><td></td><td></td></tr><tr><td></td><td>Loop
Forever</td><td></td><td></td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Fail</td><td align="undefined"
valign="undefined">This should not be
executed</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
@@ -2395,7 +2395,7 @@
- <td align="undefined" valign="undefined">Test timeout 99ms
exceeded</td>
+ <td align="undefined" valign="undefined">Test timeout 99
milliseconds exceeded.</td>
@@ -3040,7 +3040,7 @@
- <td align="undefined" valign="undefined">Keyword timeout 100ms
exceeded</td>
+ <td align="undefined" valign="undefined">Keyword timeout 100
milliseconds exceeded.</td>
@@ -4271,7 +4271,7 @@
- <td align="undefined" valign="undefined">Test timeout 42ms
exceeded</td>
+ <td align="undefined" valign="undefined">Test timeout 42
milliseconds exceeded.</td>
@@ -5715,7 +5715,7 @@
- <td align="undefined" valign="undefined">Keyword timeout 99ms
exceeded</td>
+ <td align="undefined" valign="undefined">Keyword timeout 99
milliseconds exceeded.</td>
@@ -6224,7 +6224,7 @@
- <td align="undefined" valign="undefined">Keyword timeout 1s
exceeded</td>
+ <td align="undefined" valign="undefined">Keyword timeout 1 second
exceeded.</td>
@@ -6733,7 +6733,7 @@
- <td align="undefined" valign="undefined">Test timeout 500ms
exceeded</td>
+ <td align="undefined" valign="undefined">Test timeout 500
milliseconds exceeded.</td>
@@ -7293,7 +7293,7 @@
- <td align="undefined" valign="undefined">Keyword timeout 1s
exceeded</td>
+ <td align="undefined" valign="undefined">Keyword timeout 1 second
exceeded.</td>
@@ -7750,7 +7750,7 @@
-Test timeout 1s exceeded</td>
+Test timeout 1 second exceeded.</td>
@@ -8193,7 +8193,7 @@
- <td align="undefined" valign="undefined">Test timeout 500ms
exceeded</td>
+ <td align="undefined" valign="undefined">Test timeout 500
milliseconds exceeded.</td>
@@ -8636,7 +8636,7 @@
- <td align="undefined" valign="undefined">Test timeout 1s
exceeded\n\n<br>
+ <td align="undefined" valign="undefined">Test timeout 1 second
exceeded.\n\n<br>
@@ -9150,7 +9150,7 @@
- <td align="undefined" valign="undefined">Test timeout 1s
exceeded</td>
+ <td align="undefined" valign="undefined">Test timeout 1 second
exceeded.</td>
@@ -9650,7 +9650,7 @@
- <td align="undefined" valign="undefined">Test timeout 2s
exceeded</td>
+ <td align="undefined" valign="undefined">Test timeout 2 seconds
exceeded.</td>
@@ -10546,7 +10546,7 @@
-Keyword timeout 99ms exceeded</td>
+Keyword timeout 99 milliseconds exceeded.</td>
@@ -11569,7 +11569,7 @@
-Keyword timeout 99ms exceeded</td>
+Keyword timeout 99 milliseconds exceeded.</td>
@@ -12101,7 +12101,7 @@
- <td>Keyword timeout 2s exceeded</td>
+ <td>Keyword timeout 2 seconds exceeded.</td>
@@ -12269,7 +12269,7 @@
- <td>Keyword timeout 2s exceeded</td>
+ <td>Keyword timeout 2 seconds exceeded.</td>
@@ -12437,7 +12437,7 @@
- <td align="undefined" valign="undefined">Test timeout 1s
exceeded</td>
+ <td align="undefined" valign="undefined">Test timeout 1 second
exceeded.</td>
@@ -12605,7 +12605,7 @@
- <td>Keyword timeout 99ms exceeded</td>
+ <td>Keyword timeout 99 milliseconds exceeded.</td>
@@ -12844,7 +12844,7 @@
- <td>Keyword timeout 99ms exceeded</td>
+ <td>Keyword timeout 99 milliseconds exceeded.</td>
@@ -13030,7 +13030,7 @@
- <tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Test
Timeout Should not be Active For Run keyword variants But To Keywords They
Execute</td><td>[ Documentation ]</td><td>FAIL</td><td>Test timeout 100ms
exceeded</td><td></td></tr><tr><td></td><td>[ Timeout
]</td><td>0.1</td><td></td><td></td></tr><tr><td></td><td>Run
Keyword</td><td>Sleep Without
Logging</td><td>2</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Keyword
Timeout Should not be Active For Run keyword variants But To Keywords They
Execute</td><td>[ Documentation ]</td><td>FAIL</td><td>Keyword timeout
200ms exceeded</td><td></td></tr><tr><td></td><td>Run Keyword With
Timeout</td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>It
Should Be Possible To Print From Java Libraries When Test Timeout Has Been
Set</td><td>ExampleJavaLibrary.Print</td><td>My message from java
lib</td><td></td><td></td></tr><tr>
+ <tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Test
Timeout Should not be Active For Run keyword variants But To Keywords They
Execute</td><td>[ Documentation ]</td><td>FAIL</td><td>Test timeout 100
milliseconds exceeded.</td><td></td></tr><tr><td></td><td>[ Timeout
]</td><td>0.1</td><td></td><td></td></tr><tr><td></td><td>Run
Keyword</td><td>Sleep Without
Logging</td><td>2</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Keyword
Timeout Should not be Active For Run keyword variants But To Keywords They
Execute</td><td>[ Documentation ]</td><td>FAIL</td><td>Keyword timeout 200
milliseconds exceeded.</td><td></td></tr><tr><td></td><td>Run Keyword With
Timeout</td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>It
Should Be Possible To Print From Java Libraries When Test Timeout Has Been
Set</td><td>ExampleJavaLibrary.Print</td><td>My message from java
lib</td><td></td><td></td></tr><tr>
<td align="undefined" valign="undefined"></td>
=======================================
--- /trunk/atest/testdata/parsing/data_formats/html/sample.html Mon Mar 2
00:38:15 2009
+++ /trunk/atest/testdata/parsing/data_formats/html/sample.html Tue Feb 23
07:25:40 2010
@@ -1446,7 +1446,7 @@
<td>FAIL</td>
- <td>Test timeout 1s exceeded</td>
+ <td>Test timeout 1 second exceeded.</td>
<td></td>
@@ -1527,7 +1527,7 @@
<td>FAIL</td>
- <td>Keyword timeout 1s exceeded</td>
+ <td>Keyword timeout 1 second exceeded.</td>
<td></td>
=======================================
--- /trunk/atest/testdata/parsing/data_formats/rest/sample.rst Mon Mar 2
00:38:15 2009
+++ /trunk/atest/testdata/parsing/data_formats/rest/sample.rst Tue Feb 23
07:25:40 2010
@@ -109,15 +109,15 @@
+---------------+-----------------+----------------------+--------------------+
| Test Timeout | [Timeout] | 1second
| |
+---------------+-----------------+----------------------+--------------------+
-| | [Documentation] | FAIL | Test timeout
1s |
-| | | |
exceeded |
+| | [Documentation] | FAIL | Test
timeout |
+| | | | 1 second
exceeded. |
+---------------+-----------------+----------------------+--------------------+
| | Sleep | 2 seconds
| |
+---------------+-----------------+----------------------+--------------------+
| | |
| |
+---------------+-----------------+----------------------+--------------------+
-| Keyword | [Documentation] | FAIL | Keyword timeout
1s |
-| Timeout | | |
exceeded |
+| Keyword | [Documentation] | FAIL | Keyword
timeout |
+| Timeout | | | 1 second
exceeded. |
+---------------+-----------------+----------------------+--------------------+
| | Timeouted |
| |
| | Keyword |
| |
=======================================
--- /trunk/atest/testdata/parsing/data_formats/tsv/sample.tsv Mon Mar 2
00:38:15 2009
+++ /trunk/atest/testdata/parsing/data_formats/tsv/sample.tsv Tue Feb 23
07:25:40 2010
@@ -58,10 +58,10 @@
Test Timeout [Timeout] 1second
- [Document] FAIL Test timeout 1s exceeded
+ [Document] FAIL Test timeout 1 second exceeded.
Sleep 2
-Keyword Timeout [Document] FAIL Keyword timeout 1s exceeded
+Keyword Timeout [Document] FAIL Keyword timeout 1 second
exceeded.
Timeouted Keyword
=======================================
--- /trunk/atest/testdata/parsing/data_formats/txt/sample.txt Fri Aug 14
05:04:30 2009
+++ /trunk/atest/testdata/parsing/data_formats/txt/sample.txt Tue Feb 23
07:25:40 2010
@@ -60,10 +60,10 @@
Test Timeout [Timeout] 1second
- [Document] FAIL Test timeout 1s exceeded
+ [Document] FAIL Test timeout 1 second exceeded.
Sleep 2
-Keyword Timeout [Document] FAIL Keyword timeout 1s exceeded
+Keyword Timeout [Document] FAIL Keyword timeout 1 second exceeded.
Timeouted Keyword
=======================================
--- /trunk/atest/testdata/standard_libraries/builtin/run_keyword.html Thu
Dec 10 04:35:44 2009
+++ /trunk/atest/testdata/standard_libraries/builtin/run_keyword.html Tue
Feb 23 07:25:40 2010
@@ -5656,7 +5656,7 @@
- <td>Test timeout 400ms exceeded</td>
+ <td>Test timeout 400 milliseconds exceeded.</td>
@@ -5976,7 +5976,7 @@
- <td>Keyword timeout 300ms exceeded</td>
+ <td>Keyword timeout 300 milliseconds exceeded.</td>
=======================================
---
/trunk/atest/testdata/standard_libraries/builtin/wait_until_keyword_succeeds.txt
Tue Feb 23 05:46:57 2010
+++
/trunk/atest/testdata/standard_libraries/builtin/wait_until_keyword_succeeds.txt
Tue Feb 23 07:25:40 2010
@@ -59,7 +59,7 @@
Wait Until With Shorter Test Timeout
[Timeout] 0.1 seconds
- [Documentation] FAIL Test timeout 100ms exceeded
+ [Documentation] FAIL Test timeout 100 milliseconds exceeded.
Wait Until Keyword Succeeds 1minute 0.1s Fail This won't be the
final error
Wait Until With Longer Keyword Timeout
@@ -68,7 +68,7 @@
Timeouted UK with Wait Until KW
Wait Until With Shorter Keyword Timeout
- [Documentation] FAIL Keyword timeout 40ms exceeded
+ [Documentation] FAIL Keyword timeout 40 milliseconds exceeded.
${timeout} = Set Variable 40 milliseconds
Timeouted UK with Wait Until KW
=======================================
--- /trunk/utest/running/test_timeouts.py Fri Nov 21 05:09:11 2008
+++ /trunk/utest/running/test_timeouts.py Tue Feb 23 07:25:40 2010
@@ -23,10 +23,10 @@
self._verify_tout(TestTimeout())
def test_timeout_string(self):
- for tout_str, exp_str, exp_secs in [ ('1s', '1s', 1),
- ('10 sec', '10s', 10),
- ('2h 1minute', '2h 1min',
7260),
- ('42', '42s', 42) ]:
+ for tout_str, exp_str, exp_secs in [ ('1s', '1 second', 1),
+ ('10 sec', '10 seconds', 10),
+ ('2h 1minute', '2 hours 1
minute', 7260),
+ ('42', '42 seconds', 42) ]:
self._verify_tout(TestTimeout(tout_str), exp_str, exp_secs)
def test_invalid_timeout_string(self):
@@ -42,7 +42,7 @@
['Message in','two colums'],
['My','message','in','quite','many','columns','.'] ]:
tout = TestTimeout('10sec', *msgcols)
- self._verify_tout(tout, str='10s', secs=10,
msg=' '.join(msgcols))
+ self._verify_tout(tout, str='10 seconds', secs=10,
msg=' '.join(msgcols))
def _verify_tout(self, tout, str='', secs=-1, msg=None, err=None):
assert_equals(tout.string, str)
@@ -88,19 +88,19 @@
def test_compare_when_all_timeouted(self):
touts =
self._create_timeouts(['1min','42seconds','43','1h1min','99'])
- assert_equals(min(touts).string, '42s')
- assert_equals(max(touts).string, '1h 1min')
+ assert_equals(min(touts).string, '42 seconds')
+ assert_equals(max(touts).string, '1 hour 1 minute')
def test_compare_with_timeouted_and_non_timeouted(self):
touts =
self._create_timeouts(['','1min','42sec','','43','1h1m','99',''])
assert_equals(min(touts).string, '')
- assert_equals(max(touts).string, '1h 1min')
+ assert_equals(max(touts).string, '1 hour 1 minute')
def test_that_compare_uses_starttime(self):
touts =
self._create_timeouts(['1min','42seconds','43','1h1min','99'])
touts[2].starttime -= 2
- assert_equals(min(touts).string, '43s')
- assert_equals(max(touts).string, '1h 1min')
+ assert_equals(min(touts).string, '43 seconds')
+ assert_equals(max(touts).string, '1 hour 1 minute')
def _create_timeouts(self, tout_strs):
touts = []
@@ -165,7 +165,7 @@
def test_method_stopped_if_timeout(self):
os.environ['ROBOT_THREAD_TESTING'] = 'initial value'
self.tout.secs = 0.01
- assert_raises_with_msg(TimeoutError, 'Test timeout 1s exceeded',
+ assert_raises_with_msg(TimeoutError, 'Test timeout 1 second
exceeded.',
self.tout.run, sleeping, (0.05,), {},
self.logger)
self._verify_debug_msg(self.logger.msgs[0])
time.sleep(0.1)
@@ -190,7 +190,7 @@
def _verify_debug_msg(self, msg, type='Test'):
assert_equals(msg[0], 'DEBUG')
- assert_true(msg[1].startswith('%s timeout 1s active.' % type),
msg[1])
+ assert_true(msg[1].startswith('%s timeout 1 second active.' %
type), msg[1])
assert_true(msg[1].endswith('seconds left.'), msg[1])
