summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_httpservers.py
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2017-09-13 10:27:54 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2017-09-13 10:27:54 (GMT)
commit6c25b73194714e78975eddea3799f06f3de74647 (patch)
treee4fd797ce609942e5d1d9b0f2680dfd3c094e734 /Lib/test/test_httpservers.py
parent89bfc9b0d9033f7c9f086c7281a31a489fe1136f (diff)
downloadcpython-6c25b73194714e78975eddea3799f06f3de74647.zip
cpython-6c25b73194714e78975eddea3799f06f3de74647.tar.gz
cpython-6c25b73194714e78975eddea3799f06f3de74647.tar.bz2
[3.6] bpo-31234: test_httpservers joins the server thread (GH-3188) (#3536)
(cherry picked from commit 830d7d2936434ace113822294acce82f62cde41b)
Diffstat (limited to 'Lib/test/test_httpservers.py')
-rw-r--r--Lib/test/test_httpservers.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
index 4e93144..22b3bf5 100644
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -52,6 +52,7 @@ class TestServerThread(threading.Thread):
def stop(self):
self.server.shutdown()
+ self.join()
class BaseTestCase(unittest.TestCase):