Merge r64375 to py3k
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 04df45d..d7d3cfc 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -1755,9 +1755,12 @@
#
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