From deab81483eb636658731c84f6dbc9587ceea80d9 Mon Sep 17 00:00:00 2001
From: Jeremy Johnson <jeremy@softworks.com.my>
Date: Thu, 15 Aug 2013 16:41:01 +0800
Subject: [PATCH] changed start_server to accept a number of threads... still
 defaults to 1 though

---
 django_pyvows/context.py |  4 ++--
 django_pyvows/server.py  | 10 +++++-----
 vows/context_vows.py     |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/django_pyvows/context.py b/django_pyvows/context.py
index 78af2af..cf6f96f 100644
--- a/django_pyvows/context.py
+++ b/django_pyvows/context.py
@@ -78,13 +78,13 @@ class DjangoContext(Vows.Context):
 
 class DjangoHTTPContext(DjangoContext):
 
-    def start_server(self, host=None, port=None, settings={}):
+    def start_server(self, host=None, port=None, settings={}, threads=1):
         if not port: port = DEFAULT_PORT
         if not host: host = DEFAULT_HOST
 
         self.address = (host, port)
         self.server = DjangoServer(host, port)
-        self.server.start(settings)
+        self.server.start(settings,threads)
 
     def __init__(self, parent):
         super(DjangoHTTPContext, self).__init__(parent)
diff --git a/django_pyvows/server.py b/django_pyvows/server.py
index 1c84cc2..2b4f0f6 100644
--- a/django_pyvows/server.py
+++ b/django_pyvows/server.py
@@ -16,12 +16,12 @@ from cherrypy import wsgiserver
 from django.core.handlers.wsgi import WSGIHandler
 
 
-def run_app(host, port):
+def run_app(host, port, threadCount):
     server = wsgiserver.CherryPyWSGIServer(
-        (host, port),
+        (host, port), 
         WSGIHandler(),
         server_name='tornado-pyvows',
-        numthreads = 1
+        numthreads = threadCount
     )
 
     my_thread = current_thread()
@@ -38,8 +38,8 @@ class DjangoServer(object):
         self.host = host
         self.port = port
 
-    def start(self, settings):
-        self.thr = Thread(target=run_app, args=(self.host, self.port))
+    def start(self, settings, threadCount=1):
+        self.thr = Thread(target=run_app, args=(self.host, self.port, threadCount))
         self.thr.daemon = True
         self.thr.settings = {}
         for k, v in settings.iteritems():
diff --git a/vows/context_vows.py b/vows/context_vows.py
index e74d52a..9bd596d 100644
--- a/vows/context_vows.py
+++ b/vows/context_vows.py
@@ -111,7 +111,7 @@ class ContextTest(Vows.Context):
         def topic(self):
             return self.server
         
-        def should_default_to_one_thread(self,topic):
+        def should_allow_user_to_specify_number_of_threads(self,topic):
             expect(topic.thr.server._get_numthreads()).to_equal(5)