From: Jesse Noller <jnoller@gmail.com>
Date: Wed, 18 Jun 2008 13:29:52 +0000 (+0000)
Subject: Attempt RLock creation prior to test execution on Linux, if it raises the OSError... 
X-Git-Tag: v2.6b1~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18623825d25b0f8f3b4bf96c1d5c4c2977a94004;p=thirdparty%2FPython%2Fcpython.git

Attempt RLock creation prior to test execution on Linux, if it raises the OSError in issue 3111, skip the test suite
---

diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 66df2ab8f955..0d53b3f2409d 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.test_support import run_unittest as run