Imported Upstream version 1.2.1

[platform/upstream/python-nose.git] / functional_tests / test_multiprocessing / support / timeout.py

diff --git a/functional_tests/test_multiprocessing/support/timeout.py b/functional_tests/test_multiprocessing/support/timeout.py
index 52dce12..480c859 100644 (file)
--- a/functional_tests/test_multiprocessing/support/timeout.py
+++ b/functional_tests/test_multiprocessing/support/timeout.py
@@ -1,6 +1,12 @@
+#make sure all tests in this file are dispatched to the same subprocess
+def setup():
+    pass
 
 def test_timeout():
     "this test *should* fail when process-timeout=1"
     from time import sleep
     sleep(2)
 
+# check timeout will not prevent remaining tests dispatched to the same subprocess to continue to run
+def test_pass():
+    pass