Skip to content

Commit

Permalink
Use daemon threads for solver it server tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jni committed Jul 7, 2016
1 parent 86d1f29 commit 68c14e0
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions tests/test_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,31 +54,29 @@ def test_server(dummy_data):
host, port = 'tcp://localhost', 5588
solver = serve.Solver(frag, feature_manager=fman,
address='tcp://*:' + str(port))
thread = threading.Thread(target=solver.listen, name='solver')
thread = threading.Thread(target=solver.listen, name='solver', daemon=True)
thread.start()
_, dst = serve.proofread(frag, gt, host=host, port=port, num_operations=2,
stop_when_finished=True, random_state=0)
result = np.array(dst)[frag]
# test: resulting segmentation should be improvement over fragments alone
assert (ev.vi(result, gt, ignore_x=[], ignore_y=[]) <
ev.vi(frag, gt, ignore_x=[], ignore_y=[]))
thread.join()


def test_server_imperfect_fragments(dummy_data2):
frag, gt, fman = dummy_data2
host, port = 'tcp://localhost', 5589
solver = serve.Solver(frag, feature_manager=fman,
address='tcp://*:' + str(port))
thread = threading.Thread(target=solver.listen, name='solver')
thread = threading.Thread(target=solver.listen, name='solver', daemon=True)
thread.start()
_, dst = serve.proofread(frag, gt, host=host, port=port, num_operations=2,
stop_when_finished=True, random_state=0)
result = np.array(dst)[frag]
# test: resulting segmentation should be improvement over fragments alone
assert (ev.vi(result, gt, ignore_x=[], ignore_y=[]) <
ev.vi(frag, gt, ignore_x=[], ignore_y=[]))
thread.join()


def test_server_with_id_service(dummy_data):
Expand All @@ -98,7 +96,7 @@ def test_server_with_id_service(dummy_data):
kwargs=dict(port=id_service_port,
curr_id=starting_id))
id_thread.start()
thread = threading.Thread(target=solver.listen, name='solver')
thread = threading.Thread(target=solver.listen, name='solver', daemon=True)
thread.start()
host, port = config['solver_url'].rsplit(':', maxsplit=1)
_, dst = serve.proofread(frag, gt, host=host, port=int(port),
Expand All @@ -111,7 +109,6 @@ def test_server_with_id_service(dummy_data):
# test 2: make sure ID service worked: starting ID should be as above
# should be equal but boundary ID messes things up
assert np.min(result) == starting_id + 1
thread.join()


@pytest.fixture
Expand All @@ -127,12 +124,11 @@ def test_server_long(data):
frag, gt, pr = data
host, port = 'tcp://localhost', 5590
solver = serve.Solver(frag, pr, port=port, host='tcp://*')
thread = threading.Thread(target=solver.listen, name='solver')
thread = threading.Thread(target=solver.listen, name='solver', daemon=True)
thread.start()
_, dst = serve.proofread(frag, gt, host=host, port=port,
stop_when_finished=True, random_state=0)
result = np.array(dst)[frag]
# test: resulting segmentation should be improvement over fragments alone
assert (ev.vi(result, gt, ignore_x=[], ignore_y=[]) <
ev.vi(frag, gt, ignore_x=[], ignore_y=[]))
thread.join()

0 comments on commit 68c14e0

Please sign in to comment.