Merge r64375 to py3k
This commit is contained in:
parent
66bada5653
commit
d00df3cfe6
@ -1755,9 +1755,12 @@ globals().update(testcases_threads)
|
|||||||
#
|
#
|
||||||
|
|
||||||
def test_main(run=None):
|
def test_main(run=None):
|
||||||
if sys.platform.startswith("linux") and not os.path.exists("/dev/shm"):
|
if sys.platform.startswith("linux"):
|
||||||
from test.test_support import TestSkipped
|
try:
|
||||||
raise TestSkipped("Missing required /dev/shm device on Linux!")
|
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:
|
if run is None:
|
||||||
from test.support import run_unittest as run
|
from test.support import run_unittest as run
|
||||||
|
Loading…
x
Reference in New Issue
Block a user