Revision: 95d5cf597d49
Branch: default
Author: Pekka Klärck
Date: Thu Sep 20 14:00:45 2012
Log: Made tests not working with IronPython due to bugs or missing
features in IPy itself non-critical. This might bring us green IPy build on
CI for the first time.
http://code.google.com/p/robotframework/source/detail?r=95d5cf597d49
Modified:
/atest/robot/core/timeouts.txt
/atest/robot/running/stopping_with_signal.txt
/atest/testdata/running/stopping_with_signal/Library.py
=======================================
--- /atest/robot/core/timeouts.txt Wed Sep 19 16:25:16 2012
+++ /atest/robot/core/timeouts.txt Thu Sep 20 14:00:45 2012
@@ -20,6 +20,8 @@
Check Test Case Failing Before Timeout
Show Correct Trace Back When Failing Before Timeout
+ [Documentation] For some reason IronPython loses the traceback in
this case.
+ Run Keyword If "${IRONPYTHON}" Remove Tags regression
${tc} = Check Test Case ${TEST NAME}
Should Contain ${tc.kws[0].msgs[-1].message} raise
AssertionError(msg) if msg else AssertionError()
=======================================
--- /atest/robot/running/stopping_with_signal.txt Thu Sep 13 00:51:11 2012
+++ /atest/robot/running/stopping_with_signal.txt Thu Sep 20 14:00:45 2012
@@ -1,6 +1,5 @@
*** Settings ***
-Force Tags regression
-Default Tags pybot jybot
+Force Tags regression pybot jybot
Resource atest_resource.txt
Library ProcessManager.py
Test Teardown Run Keyword If Test Failed Log Stdout And Stderr
@@ -16,13 +15,14 @@
Check Test Cases Have Failed Correctly
SIGTERM Signal Should Stop Test Execution Gracefully
- [Tags] pybot jybot x-exclude-on-windows
+ [Tags] x-exclude-on-windows
Start And Send Signal without_any_timeout.txt One SIGTERM
Process Output For Graceful Shutdown
Check Test Cases Have Failed Correctly
Execution Is Stopped Even If Keyword Swallows Exception
- [Tags] pybot
+ [Documentation] This only works with Python.
+ Run Keyword If not "${PYTHON}" Remove Tags regression
Start And Send Signal swallow_exception.txt One SIGTERM
Process Output For Graceful Shutdown
Check Test Cases Have Failed Correctly
@@ -47,7 +47,7 @@
Check Tests Have Been Forced To Shutdown
Two SIGTERM Signals Should Stop Test Execution Forcefully
- [Tags] pybot jybot x-exclude-on-windows
+ [Tags] x-exclude-on-windows
Start And Send Signal without_any_timeout.txt Two SIGTERMs 2s
Check Tests Have Been Forced To Shutdown
=======================================
--- /atest/testdata/running/stopping_with_signal/Library.py Thu Sep 13
06:29:38 2012
+++ /atest/testdata/running/stopping_with_signal/Library.py Thu Sep 20
14:00:45 2012
@@ -6,7 +6,7 @@
while time.time() < max_time:
pass
-def swallow_exception(timeout=30):
+def swallow_exception(timeout=3):
try:
busy_sleep(timeout)
except:
