mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #14373: Other attempt to fix threaded test for lru_cache().

This commit is contained in:
Serhiy Storchaka 2015-06-08 12:44:18 +03:00
parent e7070f09bc
commit 391af751f2
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Lib/test/test_functools.py
View File

@ -1110,10 +1110,10 @@ def orig(x, y):
self.assertEqual(currsize, 0) self.assertEqual(currsize, 0)
start = threading.Event() start = threading.Event()
def full(f, *args): def full(k):
start.wait(10) start.wait(10)
for _ in range(m): for _ in range(m):
f(*args) self.assertEqual(f(k, 0), orig(k, 0))
def clear(): def clear():
start.wait(10) start.wait(10)
@ -1124,19 +1124,24 @@ def clear():
sys.setswitchinterval(1e-6) sys.setswitchinterval(1e-6)
try: try:
# create n threads in order to fill cache # create n threads in order to fill cache
threads = [threading.Thread(target=full, args=[f, k, k]) threads = [threading.Thread(target=full, args=[k])
for k in range(n)] for k in range(n)]
with support.start_threads(threads): with support.start_threads(threads):
start.set() start.set()
hits, misses, maxsize, currsize = f.cache_info() hits, misses, maxsize, currsize = f.cache_info()
if self.module is py_functools:
# XXX: Why can be not equal?
self.assertLessEqual(misses, n) self.assertLessEqual(misses, n)
self.assertLessEqual(hits, m*n - misses)
else:
self.assertEqual(misses, n)
self.assertEqual(hits, m*n - misses) self.assertEqual(hits, m*n - misses)
self.assertEqual(currsize, n) self.assertEqual(currsize, n)
# create n threads in order to fill cache and 1 to clear it # create n threads in order to fill cache and 1 to clear it
threads = [threading.Thread(target=clear)] threads = [threading.Thread(target=clear)]
threads += [threading.Thread(target=full, args=[f, k, k]) threads += [threading.Thread(target=full, args=[k])
for k in range(n)] for k in range(n)]
start.clear() start.clear()
with support.start_threads(threads): with support.start_threads(threads):