Changed server.start to server.quickstart, and server.start_all to server.start.

5 files changed, 10 insertions, 10 deletions

diff --git a/cherrypy/test/benchmark.py b/cherrypy/test/benchmark.py
index fcfa664e..5800f85c 100644
--- a/cherrypy/test/benchmark.py
+++ b/cherrypy/test/benchmark.py
@@ -401,6 +401,6 @@ if __name__ == '__main__':
             cherrypy.server.request_class = NullRequest
             cherrypy.server.response_class = NullResponse
         
-        cherrypy.server.start()
+        cherrypy.server.quickstart()
         # This will block
         cherrypy.engine.start_with_callback(run)
diff --git a/cherrypy/test/helper.py b/cherrypy/test/helper.py
index 918bf280..65616c97 100644
--- a/cherrypy/test/helper.py
+++ b/cherrypy/test/helper.py
@@ -97,7 +97,7 @@ def run_test_suite(moduleNames, server, conf):
     """
     cherrypy.config.reset()
     setConfig(conf)
-    cherrypy.server.start(server)
+    cherrypy.server.quickstart(server)
     cherrypy.engine.start_with_callback(_run_test_suite_thread,
                                         args=(moduleNames, conf))
 
@@ -147,7 +147,7 @@ def testmain(conf=None):
         conf = {}
     setConfig(conf)
     try:
-        cherrypy.server.start()
+        cherrypy.server.quickstart()
         cherrypy.engine.start_with_callback(_test_main_thread)
     except KeyboardInterrupt:
         cherrypy.server.stop()
diff --git a/cherrypy/test/test_session_concurrency.py b/cherrypy/test/test_session_concurrency.py
index 6902932d..425c9830 100644
--- a/cherrypy/test/test_session_concurrency.py
+++ b/cherrypy/test/test_session_concurrency.py
@@ -79,7 +79,7 @@ def run_client(cookie, request_count, data_dict, index):
     data_dict[index] = int(data)
 
 # Start server
-cherrypy.server.start()
+cherrypy.server.quickstart()
 thread.start_new_thread(cherrypy.engine.start, ())
 
 # Start client
diff --git a/cherrypy/test/test_states.py b/cherrypy/test/test_states.py
index 77e90ca2..c44116d7 100644
--- a/cherrypy/test/test_states.py
+++ b/cherrypy/test/test_states.py
@@ -67,7 +67,7 @@ class ServerStateTests(helper.CPWebCase):
         self.assertEqual(len(db_connection.threads), 0)
         
         # Test server start
-        cherrypy.server.start(self.server_class)
+        cherrypy.server.quickstart(self.server_class)
         cherrypy.engine.start(blocking=False)
         self.assertEqual(cherrypy.engine.state, 1)
         
@@ -110,7 +110,7 @@ class ServerStateTests(helper.CPWebCase):
         cherrypy.server.stop()
     
     def test_1_Restart(self):
-        cherrypy.server.start(self.server_class)
+        cherrypy.server.start()
         cherrypy.engine.start(blocking=False)
         
         # The db_connection should be running now
@@ -152,8 +152,8 @@ class ServerStateTests(helper.CPWebCase):
             # Raise a keyboard interrupt in the HTTP server's main thread.
             # We must start the server in this, the main thread
             cherrypy.engine.start(blocking=False)
-            cherrypy.server.start(self.server_class)
-            cherrypy.server.httpservers.values()[0].interrupt = KeyboardInterrupt
+            cherrypy.server.start()
+            cherrypy.server.httpservers.keys()[0].interrupt = KeyboardInterrupt
             while cherrypy.engine.state != 0:
                 time.sleep(0.1)
             
@@ -166,7 +166,7 @@ class ServerStateTests(helper.CPWebCase):
             # This should raise a BadStatusLine error, since the worker
             # thread will just die without writing a response.
             cherrypy.engine.start(blocking=False)
-            cherrypy.server.start(self.server_class)
+            cherrypy.server.start()
             
             from httplib import BadStatusLine
             try:
diff --git a/cherrypy/test/test_states_demo.py b/cherrypy/test/test_states_demo.py
index 65681165..d8f949fc 100644
--- a/cherrypy/test/test_states_demo.py
+++ b/cherrypy/test/test_states_demo.py
@@ -27,4 +27,4 @@ if __name__ == '__main__':
                             "environment": "development",
                             })
     cherrypy.quickstart(Root())
- 
\ No newline at end of file
+    
\ No newline at end of file