Issue 3056 - [cms] Enable threading for the test server

cms/bin/test_server.py

Index: cms/bin/test_server.py
===================================================================
--- a/cms/bin/test_server.py
+++ b/cms/bin/test_server.py
@@ -123,7 +123,10 @@
     sys.exit("Usage: %s [source_dir]" % sys.argv[0])
 
   try:
-    from werkzeug.serving import run_simple
+    from werkzeug.serving import ThreadedWSGIServer, run_simple
+
+    ThreadedWSGIServer.daemon_threads = True
+
     def run(*args, **kwargs):
       # The werkzeug logger must be configured before the
       # root logger. Also we must prevent it from propagating
@@ -134,9 +137,14 @@
       logger.setLevel(logging.INFO)
       logger.addHandler(logging.StreamHandler())
 
-      run_simple(*args, **kwargs)
+      run_simple(threaded=True, *args, **kwargs)
   except ImportError:
-    from wsgiref.simple_server import make_server
+    from SocketServer import ThreadingMixIn
+    from wsgiref.simple_server import WSGIServer, make_server
+
+    class ThreadedWSGIServer(ThreadingMixIn, WSGIServer):
+      daemon_threads = True
+
     def run(host, port, app, **kwargs):
       def wrapper(environ, start_response):
         try:
@@ -145,7 +153,7 @@
           return show_error(start_response, "500 Internal Server Error",
               uri=environ.get("PATH_INFO"), error=e)
 
-      server = make_server(host, port, wrapper)
+      server = make_server(host, port, wrapper, ThreadedWSGIServer)
       print " * Running on http://%s:%i/" % server.server_address
       server.serve_forever()