diff options
| author | schlamar <marc.schlaich@gmail.com> | 2013-04-05 12:40:05 +0200 |
|---|---|---|
| committer | schlamar <marc.schlaich@gmail.com> | 2013-04-05 13:29:11 +0200 |
| commit | 52cdb26781a5fe6f293684f322217ac9c8b2c00b (patch) | |
| tree | 98435d1cccefbef887d91e51549dfd18d30f1544 /dummyserver | |
| parent | 82cee121ed5cf5217063ff5618905e234160727e (diff) | |
| download | urllib3-52cdb26781a5fe6f293684f322217ac9c8b2c00b.tar.gz | |
Fixes possible deadlock in threads.
Diffstat (limited to 'dummyserver')
| -rw-r--r-- | dummyserver/testcase.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/dummyserver/testcase.py b/dummyserver/testcase.py index 518d739b..73b8f2f8 100644 --- a/dummyserver/testcase.py +++ b/dummyserver/testcase.py @@ -32,6 +32,11 @@ class SocketDummyServerTestCase(unittest.TestCase): # Lock gets released by thread above ready_lock.acquire() + @classmethod + def tearDownClass(cls): + if hasattr(cls, 'server_thread'): + cls.server_thread.join() + class HTTPDummyServerTestCase(unittest.TestCase): scheme = 'http' @@ -54,6 +59,7 @@ class HTTPDummyServerTestCase(unittest.TestCase): @classmethod def _stop_server(cls): cls.server_thread.stop() + cls.server_thread.join() @classmethod def setUpClass(cls): |