Merge r64375 to py3k

diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 04df45d5920d303b79489a2ebad6533c52846458..d7d3cfcdbd53f478a9090410b13e3bae851d38a8 100644 (file)
--- 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