summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2019-02-07 10:46:29 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2019-02-07 10:46:29 +0100
commitff613484095b47a205ea116372cecd5c68b5613c (patch)
treede6979789b2f9dd5dbd57e8c1ef7bb8ddf997fe2
parent638dd490e5c787cbc7a4a197bdec16bc3e0e4718 (diff)
downloadcpython-git-mp-manager-tests.tar.gz
Treat Lock and RLock differently.mp-manager-tests
See: https://github.com/python/cpython/pull/11772#issuecomment-461343609
-rw-r--r--Lib/test/_test_multiprocessing.py19
1 files changed, 9 insertions, 10 deletions
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index d0a348a68f..2f839b9521 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -4815,14 +4815,17 @@ class TestSyncManagerTypes(unittest.TestCase):
def test_lock(self, lname="Lock"):
o = getattr(self.manager, lname)()
self.run_worker(self._test_lock, o)
- # See: https://ci.appveyor.com/project/python/cpython/builds/22183338
- if os.name == 'nt':
- time.sleep(0.3)
o.release()
self.assertRaises(RuntimeError, o.release) # already released
- def test_rlock(self):
- self.test_lock(lname="RLock")
+ @classmethod
+ def _test_rlock(cls, obj):
+ obj.acquire()
+ obj.release()
+
+ def test_rlock(self, lname="Lock"):
+ o = getattr(self.manager, lname)()
+ self.run_worker(self._test_rlock, o)
@classmethod
def _test_semaphore(cls, obj):
@@ -4839,15 +4842,11 @@ class TestSyncManagerTypes(unittest.TestCase):
@classmethod
def _test_condition(cls, obj):
obj.acquire()
+ obj.release()
def test_condition(self):
o = self.manager.Condition()
self.run_worker(self._test_condition, o)
- # See: https://ci.appveyor.com/project/python/cpython/builds/22183338
- if os.name == 'nt':
- time.sleep(0.3)
- o.release()
- self.assertRaises(RuntimeError, o.release) # already released
@classmethod
def _test_barrier(cls, obj):