Revision: 4104
Author: jprantan
Date: Thu Sep 23 05:22:52 2010
Log: Updated tests, issue 641.
http://code.google.com/p/robotframework/source/detail?r=4104
Modified:
/trunk/atest/resources/TestHelper.py
/trunk/atest/robot/standard_libraries/dialogs/dialogs.txt
/trunk/atest/testdata/standard_libraries/dialogs/dialogs.txt
=======================================
--- /trunk/atest/resources/TestHelper.py Fri Apr 30 04:41:41 2010
+++ /trunk/atest/resources/TestHelper.py Thu Sep 23 05:22:52 2010
@@ -35,3 +35,9 @@
def running_on_jython(self, interpreter):
return 'jython' in interpreter
+
+ def running_on_python(self, interpreter):
+ return not self.running_on_jython(interpreter)
+
+ def running_on_windows(self):
+ return os.path.sep == '\\'
=======================================
--- /trunk/atest/robot/standard_libraries/dialogs/dialogs.txt Fri Sep 17
07:52:39 2010
+++ /trunk/atest/robot/standard_libraries/dialogs/dialogs.txt Thu Sep 23
05:22:52 2010
@@ -23,4 +23,9 @@
Check Test Case ${TESTNAME}
Dialog and timeout
- Check Test Case ${TESTNAME}
+ ${on python} = Running On Python ${INTERPRETER}
+ ${on windows} = Running On Windows
+ ${message} = Set Variable If ${on python} and ${on windows}
+ ... Dialogs library cannot be used with timeout on Windows with
Python.
+ ... Test timeout 1 seconds exceeded.
+ Check Test Case ${TESTNAME} FAIL ${message}
=======================================
--- /trunk/atest/testdata/standard_libraries/dialogs/dialogs.txt Fri Sep 17
07:52:39 2010
+++ /trunk/atest/testdata/standard_libraries/dialogs/dialogs.txt Thu Sep 23
05:22:52 2010
@@ -1,6 +1,5 @@
*** Settings ***
Library Dialogs
-Test Timeout 1 minute
*** Test Cases ***
Pause Execution
@@ -28,7 +27,5 @@
Get Selection From User Press Cancel. zip zap foo
Dialog and timeout
- [Documentation] FAIL Test timeout 2 seconds exceeded.
- [Timeout] 2s
- Execute Manual Step Press PASS (if you are fast enough)
+ [Timeout] 1s
Execute Manual Step Wait for timeout
