dcramer
diff --git a/‎devserver/__init__.py
Lines changed: 1 addition & 1 deletion b/‎devserver/__init__.py
Lines changed: 1 addition & 1 deletion
diff --git a/‎devserver/testcases.py
Lines changed: 40 additions & 5 deletions b/‎devserver/testcases.py
Lines changed: 40 additions & 5 deletions
@@ -10,7 +10,7 @@
 """
 
 __all__ = ('__version__', '__build__', '__docformat__', 'get_revision')
-__version__ = (0, 3, 2)
+__version__ = (0, 4, 0)
 __docformat__ = 'restructuredtext en'
 
 import os
 
@@ -1,26 +1,56 @@
+import socket
 import SocketServer
+import threading
 
 from django.conf import settings
 from django.core.handlers.wsgi import WSGIHandler
 from django.core.management import call_command
-from django.core.servers.basehttp import StoppableWSGIServer, AdminMediaHandler, WSGIServerException
-from django.test.testcases import TestServerThread
+from django.core.servers.basehttp import WSGIServer, AdminMediaHandler, WSGIServerException
 
 from devserver.utils.http import SlimWSGIRequestHandler
 
 
-class ThreadedTestServerThread(TestServerThread):
+class StoppableWSGIServer(WSGIServer):
+    """WSGIServer with short timeout, so that server thread can stop this server."""
+
+    def server_bind(self):
+        """Sets timeout to 1 second."""
+        WSGIServer.server_bind(self)
+        self.socket.settimeout(1)
+
+    def get_request(self):
+        """Checks for timeout when getting request."""
+        try:
+            sock, address = self.socket.accept()
+            sock.settimeout(None)
+            return (sock, address)
+        except socket.timeout:
+            raise
+
+
+class ThreadedTestServerThread(threading.Thread):
+    """Thread for running a http server while tests are running."""
+
+    def __init__(self, address, port):
+        self.address = address
+        self.port = port
+        self._stopevent = threading.Event()
+        self.started = threading.Event()
+        self.error = None
+        super(ThreadedTestServerThread, self).__init__()
+
     def run(self):
+        """Sets up test server and database and loops over handling http requests."""
         try:
-            wsgi_handler = AdminMediaHandler(WSGIHandler())
+            handler = AdminMediaHandler(WSGIHandler())
             server_address = (self.address, self.port)
 
             class new(SocketServer.ThreadingMixIn, StoppableWSGIServer):
                 def __init__(self, *args, **kwargs):
                     StoppableWSGIServer.__init__(self, *args, **kwargs)
 
             httpd = new(server_address, SlimWSGIRequestHandler)
-            httpd.set_app(wsgi_handler)
+            httpd.set_app(handler)
             self.started.set()
         except WSGIServerException, e:
             self.error = e
@@ -39,3 +69,8 @@ def __init__(self, *args, **kwargs):
         # Loop until we get a stop event.
         while not self._stopevent.isSet():
             httpd.handle_request()
+
+    def join(self, timeout=None):
+        """Stop the thread and wait for it to finish."""
+        self._stopevent.set()
+        threading.Thread.join(self, timeout)