Revision: e90ccfcfeb2b
Branch: default
Author: Pekka Klärck
Date: Tue Nov 19 08:31:47 2013 UTC
Log: various IronPython test fixes
http://code.google.com/p/robotframework/source/detail?r=e90ccfcfeb2b
Modified:
/atest/resources/atest_resource.txt
/atest/robot/cli/runner/runfailed_corners.txt
/atest/testdata/standard_libraries/builtin/wait_until_keyword_succeeds.txt
/atest/testdata/standard_libraries/process/get_process_result.txt
/atest/testresources/testlibs/FailUntilSucceeds.py
=======================================
--- /atest/resources/atest_resource.txt Thu Nov 7 14:31:54 2013 UTC
+++ /atest/resources/atest_resource.txt Tue Nov 19 08:31:47 2013 UTC
@@ -189,10 +189,20 @@
${content} = Get Output File ${path}
${exp} = Catenate @{expected}
Should Be Equal ${content} ${exp}
+
+File Should Match
+ [Arguments] ${path} @{expected}
+ ${content} = Get Output File ${path}
+ ${exp} = Catenate @{expected}
+ Should Match ${content} ${exp}
Stderr Should Be Equal To
[Arguments] @{expected}
- File Should Be Equal To ${STDERR FILE} @{EXPECTED}
+ File Should Be Equal To ${STDERR FILE} @{expected}
+
+Stderr Should Match
+ [Arguments] @{expected}
+ File Should Match ${STDERR FILE} @{expected}
Stderr Should Be Empty
${stderr} = Get Stderr
=======================================
--- /atest/robot/cli/runner/runfailed_corners.txt Tue Aug 27 13:29:05 2013
UTC
+++ /atest/robot/cli/runner/runfailed_corners.txt Tue Nov 19 08:31:47 2013
UTC
@@ -26,10 +26,10 @@
Stops on error when output does not exist
Run Tests Without Processing Output --runfailed nonex.xml
cli/runfailed/onlypassing
- Stderr Should Be Equal To
+ Stderr Should Match
... [ ERROR ] Collecting failed tests from 'nonex.xml' failed:
... Reading XML source 'nonex.xml' failed:
- ... No such file or directory${USAGE TIP}\n
+ ... No such file*${USAGE TIP}\n
Stops on error when output is invalid
Create File ${RUN FAILED FROM} <xml><but not='correct'/></xml>
=======================================
---
/atest/testdata/standard_libraries/builtin/wait_until_keyword_succeeds.txt
Mon May 13 11:18:50 2013 UTC
+++
/atest/testdata/standard_libraries/builtin/wait_until_keyword_succeeds.txt
Tue Nov 19 08:31:47 2013 UTC
@@ -34,11 +34,12 @@
... Wait Until Keyword Succeeds 1 seconds invalid No Operation
Wait Until In User Keyword
- Wait Until Inside User Keyword
+ Wait Until Inside User Keyword
Failing User Keyword with Wait Until
- [Documentation] FAIL Timeout 200 milliseconds exceeded. The last
error was: Still 0 times to fail!
- Wait Until Keyword Succeeds ${0.2} 0.11 User Keyword
+ [Documentation] FAIL REGEXP: Timeout 123 milliseconds exceeded. The
last error was: Still \\d times to fail!
+ Set Times To Fail 10
+ Wait Until Keyword Succeeds ${0.12345} 0.02 User Keyword
Passing User Keyword with Wait Until
${return value} = Wait Until Keyword Succeeds 10 minutes 10
milliseconds User Keyword
=======================================
--- /atest/testdata/standard_libraries/process/get_process_result.txt Fri
Nov 15 13:53:15 2013 UTC
+++ /atest/testdata/standard_libraries/process/get_process_result.txt Tue
Nov 19 08:31:47 2013 UTC
@@ -2,7 +2,7 @@
Library Process
Resource resource.txt
Test Setup Run Robot Process
-Suite Teardown Remove File ${TEMP FILE}
+Suite Teardown Safe Remove File ${TEMP FILE}
*** Variables ***
${TEMPFILE} %{TEMPDIR}${/}get-process-result.txt
=======================================
--- /atest/testresources/testlibs/FailUntilSucceeds.py Wed Apr 1 21:41:16
2009 UTC
+++ /atest/testresources/testlibs/FailUntilSucceeds.py Tue Nov 19 08:31:47
2013 UTC
@@ -1,12 +1,14 @@
class FailUntilSucceeds:
-
ROBOT_LIBRARY_SCOPE = 'TESTCASE'
-
+
def __init__(self, times_to_fail=0):
self.times_to_fail = int(times_to_fail)
-
+
+ def set_times_to_fail(self, times_to_fail):
+ self.__init__(times_to_fail)
+
def fail_until_retried_often_enough(self, message="Hello"):
self.times_to_fail -= 1
if self.times_to_fail >= 0:
- raise Exception('Still %d times to fail!' %
(self.times_to_fail))
+ raise Exception('Still %d times to fail!' % self.times_to_fail)
return message
--
---
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.
