3 new revisions:
Revision: 5881ad6624fe
Author: Mikko Korpela <[email protected]>
Date: Tue Jan 24 07:15:16 2012
Log: Dialogs: can not be used with timeouts
http://code.google.com/p/robotframework/source/detail?r=5881ad6624fe
Revision: 3bcbfcd32543
Author: Mikko Korpela <[email protected]>
Date: Fri Jan 27 04:17:17 2012
Log: Dialogs with timeouts docs
http://code.google.com/p/robotframework/source/detail?r=3bcbfcd32543
Revision: cb016a238039
Author: Mikko Korpela <[email protected]>
Date: Fri Jan 27 04:35:32 2012
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=cb016a238039
==============================================================================
Revision: 5881ad6624fe
Author: Mikko Korpela <[email protected]>
Date: Tue Jan 24 07:15:16 2012
Log: Dialogs: can not be used with timeouts
http://code.google.com/p/robotframework/source/detail?r=5881ad6624fe
Modified:
/src/robot/libraries/Dialogs.py
=======================================
--- /src/robot/libraries/Dialogs.py Thu Oct 13 14:29:34 2011
+++ /src/robot/libraries/Dialogs.py Tue Jan 24 07:15:16 2012
@@ -21,7 +21,7 @@
The library has following two limitations:
- It is not compatible with IronPython.
-- It cannot be used with timeouts on other operating systems than Linux.
+- It cannot be used with timeouts.
"""
import sys
==============================================================================
Revision: 3bcbfcd32543
Author: Mikko Korpela <[email protected]>
Date: Fri Jan 27 04:17:17 2012
Log: Dialogs with timeouts docs
http://code.google.com/p/robotframework/source/detail?r=3bcbfcd32543
Modified:
/atest/robot/standard_libraries/dialogs/dialogs.txt
/atest/testdata/standard_libraries/dialogs/dialogs.txt
/src/robot/libraries/Dialogs.py
=======================================
--- /atest/robot/standard_libraries/dialogs/dialogs.txt Thu Oct 6 15:05:51
2011
+++ /atest/robot/standard_libraries/dialogs/dialogs.txt Fri Jan 27 04:17:17
2012
@@ -1,6 +1,6 @@
*** Settings ***
-Suite Setup Run Tests ${EMPTY} standard_libraries/dialogs/dialogs.txt
-Force Tags regression jybot pybot manual
+Suite Setup Run Tests --exclude jybot_only
standard_libraries/dialogs/dialogs.txt
+Default Tags regression jybot pybot manual
Resource atest_resource.txt
*** Test Cases ***
@@ -23,9 +23,6 @@
Check Test Case ${TESTNAME}
Dialog and timeout
- ${on python} = Running On Python ${INTERPRETER}
- ${on linux} = Running On Linux
- ${message} = Set Variable If ${on python} and not ${on linux}
- ... Dialogs library is not supported with timeouts on Python on this
platform.
- ... Test timeout 1 second exceeded.
- Check Test Case ${TESTNAME} FAIL ${message}
+ [Tags] regression jybot manual
+ Run Tests --include jybot_only standard_libraries/dialogs/dialogs.txt
+ Check Test Case ${TESTNAME} FAIL Test timeout 1 second exceeded.
=======================================
--- /atest/testdata/standard_libraries/dialogs/dialogs.txt Fri Oct 7
02:16:47 2011
+++ /atest/testdata/standard_libraries/dialogs/dialogs.txt Fri Jan 27
04:17:17 2012
@@ -32,4 +32,5 @@
Dialog and timeout
[Timeout] 1s
+ [Tags] jybot_only
Execute Manual Step Wait for timeout
=======================================
--- /src/robot/libraries/Dialogs.py Tue Jan 24 07:15:16 2012
+++ /src/robot/libraries/Dialogs.py Fri Jan 27 04:17:17 2012
@@ -21,7 +21,7 @@
The library has following two limitations:
- It is not compatible with IronPython.
-- It cannot be used with timeouts.
+- It cannot be used with timeouts in Python.
"""
import sys
==============================================================================
Revision: cb016a238039
Author: Mikko Korpela <[email protected]>
Date: Fri Jan 27 04:35:32 2012
Log: Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=cb016a238039
