From d00df3cfe67af754255a39f597375a8ca8fc986d Mon Sep 17 00:00:00 2001 From: Jesse Noller Date: Wed, 18 Jun 2008 14:22:48 +0000 Subject: [PATCH] Merge r64375 to py3k --- Lib/test/test_multiprocessing.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py index 04df45d5920..d7d3cfcdbd5 100644 --- a/Lib/test/test_multiprocessing.py +++ b/Lib/test/test_multiprocessing.py @@ -1755,9 +1755,12 @@ globals().update(testcases_threads) # def test_main(run=None): - if sys.platform.startswith("linux") and not os.path.exists("/dev/shm"): - from test.test_support import TestSkipped - raise TestSkipped("Missing required /dev/shm device on Linux!") + if sys.platform.startswith("linux"): + try: + lock = multiprocessing.RLock() + except OSError: + from test.test_support import TestSkipped + raise TestSkipped("OSError raises on RLock creation, see issue 3111!") if run is None: from test.support import run_unittest as run