mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-07 15:42:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

bpo-45310: Fix parrallel shared memory tests (GH-28661)

Browse source 
Add a PID to names of POSIX shared memory objects to allow
running multiprocessing tests (test_multiprocessing_fork,
test_multiprocessing_spawn, etc) in parallel.
This commit is contained in:
Serhiy Storchaka 2021-10-01 10:56:32 +03:00 • committed by GitHub
parent 1ee0f94d16
commit eb4495e8e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Lib/test/_test_multiprocessing.py
View file

@ -3773,12 +3773,19 @@ class _TestSharedMemory(BaseTestCase):
local_sms.buf[:len(binary_data)] = binary_data local_sms.buf[:len(binary_data)] = binary_data
local_sms.close() local_sms.close()
def _new_shm_name(self, prefix):
# Add a PID to the name of a POSIX shared memory object to allow
# running multiprocessing tests (test_multiprocessing_fork,
# test_multiprocessing_spawn, etc) in parallel.
return prefix + str(os.getpid())
def test_shared_memory_basics(self): def test_shared_memory_basics(self):
sms = shared_memory.SharedMemory('test01_tsmb', create=True, size=512) name_tsmb = self._new_shm_name('test01_tsmb')
sms = shared_memory.SharedMemory(name_tsmb, create=True, size=512)
self.addCleanup(sms.unlink) self.addCleanup(sms.unlink)
# Verify attributes are readable. # Verify attributes are readable.
self.assertEqual(sms.name, 'test01_tsmb') self.assertEqual(sms.name, name_tsmb)
self.assertGreaterEqual(sms.size, 512) self.assertGreaterEqual(sms.size, 512)
self.assertGreaterEqual(len(sms.buf), sms.size) self.assertGreaterEqual(len(sms.buf), sms.size)
@ -3798,12 +3805,12 @@ class _TestSharedMemory(BaseTestCase):
self.assertEqual(sms.buf[0], 42) self.assertEqual(sms.buf[0], 42)
# Attach to existing shared memory segment. # Attach to existing shared memory segment.
also_sms = shared_memory.SharedMemory('test01_tsmb') also_sms = shared_memory.SharedMemory(name_tsmb)
self.assertEqual(also_sms.buf[0], 42) self.assertEqual(also_sms.buf[0], 42)
also_sms.close() also_sms.close()
# Attach to existing shared memory segment but specify a new size. # Attach to existing shared memory segment but specify a new size.
same_sms = shared_memory.SharedMemory('test01_tsmb', size=20*sms.size) same_sms = shared_memory.SharedMemory(name_tsmb, size=20*sms.size)
self.assertLess(same_sms.size, 20*sms.size) # Size was ignored. self.assertLess(same_sms.size, 20*sms.size) # Size was ignored.
same_sms.close() same_sms.close()
@ -3821,7 +3828,7 @@ class _TestSharedMemory(BaseTestCase):
'multiprocessing.shared_memory._make_filename') as mock_make_filename: 'multiprocessing.shared_memory._make_filename') as mock_make_filename:
NAME_PREFIX = shared_memory._SHM_NAME_PREFIX NAME_PREFIX = shared_memory._SHM_NAME_PREFIX
names = ['test01_fn', 'test02_fn'] names = [self._new_shm_name('test01_fn'), self._new_shm_name('test02_fn')]
# Prepend NAME_PREFIX which can be '/psm_' or 'wnsm_', necessary # Prepend NAME_PREFIX which can be '/psm_' or 'wnsm_', necessary
# because some POSIX compliant systems require name to start with / # because some POSIX compliant systems require name to start with /
names = [NAME_PREFIX + name for name in names] names = [NAME_PREFIX + name for name in names]
@ -3843,17 +3850,17 @@ class _TestSharedMemory(BaseTestCase):
# manages unlinking on its own and unlink() does nothing). # manages unlinking on its own and unlink() does nothing).
# True release of shared memory segment does not necessarily # True release of shared memory segment does not necessarily
# happen until process exits, depending on the OS platform. # happen until process exits, depending on the OS platform.
with self.assertRaises(FileNotFoundError): name_dblunlink = self._new_shm_name('test01_dblunlink')
sms_uno = shared_memory.SharedMemory( sms_uno = shared_memory.SharedMemory(
'test01_dblunlink', name_dblunlink,
create=True, create=True,
size=5000 size=5000
) )
with self.assertRaises(FileNotFoundError):
try: try:
self.assertGreaterEqual(sms_uno.size, 5000) self.assertGreaterEqual(sms_uno.size, 5000)
sms_duo = shared_memory.SharedMemory('test01_dblunlink') sms_duo = shared_memory.SharedMemory(name_dblunlink)
sms_duo.unlink() # First shm_unlink() call. sms_duo.unlink() # First shm_unlink() call.
sms_duo.close() sms_duo.close()
sms_uno.close() sms_uno.close()
@ -3865,7 +3872,7 @@ class _TestSharedMemory(BaseTestCase):
# Attempting to create a new shared memory segment with a # Attempting to create a new shared memory segment with a
# name that is already in use triggers an exception. # name that is already in use triggers an exception.
there_can_only_be_one_sms = shared_memory.SharedMemory( there_can_only_be_one_sms = shared_memory.SharedMemory(
'test01_tsmb', name_tsmb,
create=True, create=True,
size=512 size=512
) )
@ -3879,7 +3886,7 @@ class _TestSharedMemory(BaseTestCase):
# case of MacOS/darwin, requesting a smaller size is disallowed. # case of MacOS/darwin, requesting a smaller size is disallowed.
class OptionalAttachSharedMemory(shared_memory.SharedMemory): class OptionalAttachSharedMemory(shared_memory.SharedMemory):
_flags = os.O_CREAT | os.O_RDWR _flags = os.O_CREAT | os.O_RDWR
ok_if_exists_sms = OptionalAttachSharedMemory('test01_tsmb') ok_if_exists_sms = OptionalAttachSharedMemory(name_tsmb)
self.assertEqual(ok_if_exists_sms.size, sms.size) self.assertEqual(ok_if_exists_sms.size, sms.size)
ok_if_exists_sms.close() ok_if_exists_sms.close()
@ -4084,10 +4091,11 @@ class _TestSharedMemory(BaseTestCase):
self.assertEqual(sl.count(b'adios'), 0) self.assertEqual(sl.count(b'adios'), 0)
# Exercise creating a duplicate. # Exercise creating a duplicate.
sl_copy = shared_memory.ShareableList(sl, name='test03_duplicate') name_duplicate = self._new_shm_name('test03_duplicate')
sl_copy = shared_memory.ShareableList(sl, name=name_duplicate)
try: try:
self.assertNotEqual(sl.shm.name, sl_copy.shm.name) self.assertNotEqual(sl.shm.name, sl_copy.shm.name)
self.assertEqual('test03_duplicate', sl_copy.shm.name) self.assertEqual(name_duplicate, sl_copy.shm.name)
self.assertEqual(list(sl), list(sl_copy)) self.assertEqual(list(sl), list(sl_copy))
self.assertEqual(sl.format, sl_copy.format) self.assertEqual(sl.format, sl_copy.format)
sl_copy[-1] = 77 sl_copy[-1] = 77