##// END OF EJS Templates
Merge pull request #2025 from jdmarch/win_xp_parallel_test_wait_for_cleanup...
Min RK -
r7690:b1eae246 merge
parent child Browse files
Show More
@@ -17,6 +17,7 b' Authors:'
17 17 #-------------------------------------------------------------------------------
18 18
19 19 import sys
20 import platform
20 21 import time
21 22 from tempfile import mktemp
22 23 from StringIO import StringIO
@@ -42,6 +43,13 b' def setup():'
42 43
43 44 class TestView(ClusterTestCase, ParametricTestCase):
44 45
46 def setUp(self):
47 # On Win XP, wait for resource cleanup, else parallel test group fails
48 if platform.system() == "Windows" and platform.win32_ver()[0] == "XP":
49 # 1 sec fails. 1.5 sec seems ok. Using 2 sec for margin of safety
50 time.sleep(2)
51 super(TestView, self).setUp()
52
45 53 def test_z_crash_mux(self):
46 54 """test graceful handling of engine death (direct)"""
47 55 raise SkipTest("crash tests disabled, due to undesirable crash reports")
General Comments 0
You need to be logged in to leave comments. Login now