diff options
| author | Joshua Harlow <harlowja@gmail.com> | 2014-08-31 00:18:30 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@gmail.com> | 2014-08-31 00:18:30 -0700 |
| commit | f19ac43aa36239fda95fd8581e2f01e146fe56bb (patch) | |
| tree | 57c38027c3174a782139e7f362bb9742d93b8358 | |
| parent | f42c162e3ba8f15c1b51e77c2fa62e20a8ac176f (diff) | |
| download | zake-f19ac43aa36239fda95fd8581e2f01e146fe56bb.tar.gz | |
Ensure all test threads are made as daemon threads
| -rw-r--r-- | zake/tests/test_client.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/zake/tests/test_client.py b/zake/tests/test_client.py index b2b49f5..ac4b4f5 100644 --- a/zake/tests/test_client.py +++ b/zake/tests/test_client.py @@ -29,6 +29,12 @@ from zake import fake_client from zake import test +def make_daemon_thread(*args, **kwargs): + t = threading.Thread(*args, **kwargs) + t.daemon = True + return t + + @contextlib.contextmanager def start_close(client): client.start() @@ -118,7 +124,7 @@ class TestClient(test.Test): threads = [] for i in range(0, 20): - threads.append(threading.Thread(target=do_restart)) + threads.append(make_daemon_thread(target=do_restart)) threads[-1].start() while threads: t = threads.pop() @@ -302,8 +308,7 @@ class TestClient(test.Test): paths = [] for i in range(0, 20): paths.append("/tmp%010d" % (i)) - t = threading.Thread(target=thread_create, args=(c, paths[-1])) - t.daemon = True + t = make_daemon_thread(target=thread_create, args=(c, paths[-1])) threads.append(t) t.start() while threads: @@ -329,9 +334,8 @@ class TestClient(test.Test): paths = [] for i in range(0, 20): paths.append("/tmp%010d" % (i % 10)) - t = threading.Thread(target=thread_create, - args=(c, paths[-1], i)) - t.daemon = True + t = make_daemon_thread(target=thread_create, + args=(c, paths[-1], i)) threads.append(t) t.start() while threads: @@ -503,8 +507,8 @@ class TestMultiClient(test.Test): threads = [] for i in range(0, len(clients)): - threads.append(threading.Thread(target=increment, - args=(clients[i],))) + threads.append(make_daemon_thread(target=increment, + args=(clients[i],))) try: for t in threads: t.start() |