From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 13 Sep 2017 10:27:54 +0000 (-0700)
Subject: [3.6] bpo-31234: test_httpservers joins the server thread (GH-3188) (#3536)
X-Git-Tag: v3.6.3rc1~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c25b73194714e78975eddea3799f06f3de74647;p=thirdparty%2FPython%2Fcpython.git

[3.6] bpo-31234: test_httpservers joins the server thread (GH-3188) (#3536)

(cherry picked from commit 830d7d2936434ace113822294acce82f62cde41b)
---

diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
index 4e931446b9ef..22b3bf5235c4 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):