Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-05-02 06:36:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor thread_raise safety to use a context manager

Browse source
This commit is contained in:
Noah Levitt 2017-04-24 19:51:51 -07:00
parent 7706bab8b8
commit 0953e6972e
2 changed files with 87 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

35
tests/test_units.py
View file

@ -197,18 +197,19 @@ def test_thread_raise():
thread_preamble_done = threading.Event()
thread_caught_exception = None
def thread_target(accept_exceptions=False, block_exceptions=False):
if accept_exceptions:
brozzler.thread_accept_exceptions()
if block_exceptions:
brozzler.thread_block_exceptions()
thread_preamble_done.set()
def thread_target(accept_exceptions=False):
try:
logging.info('waiting')
let_thread_finish.wait()
if accept_exceptions:
with brozzler.thread_accept_exceptions():
thread_preamble_done.set()
logging.info('waiting (accepting exceptions)')
let_thread_finish.wait()
else:
thread_preamble_done.set()
logging.info('waiting (not accepting exceptions)')
let_thread_finish.wait()
except Exception as e:
logging.info('caught exception %s', e)
logging.info('caught exception %s', repr(e))
nonlocal thread_caught_exception
thread_caught_exception = e
finally:
@ -219,7 +220,7 @@ def test_thread_raise():
# test that thread_raise does not raise exception in a thread that has not
# called thread_accept_exceptions
thread_caught_exception = None
th = threading.Thread(target=lambda: thread_target())
th = threading.Thread(target=lambda: thread_target(accept_exceptions=False))
th.start()
thread_preamble_done.wait()
with pytest.raises(TypeError):
@ -244,15 +245,3 @@ def test_thread_raise():
with pytest.raises(threading.ThreadError): # thread is not running
brozzler.thread_raise(th, Exception)
# test that thread_raise does not raise exception in a thread that has
# called thread_block_exceptions
thread_caught_exception = None
th = threading.Thread(target=lambda: thread_target(block_exceptions=True))
th.start()
thread_preamble_done.wait()
assert brozzler.thread_raise(th, Exception) is False
let_thread_finish.set()
th.join()
assert thread_caught_exception is None