Changeset 709

Timestamp:

10/03/05 12:01:29

Author:

fumanchu

Message:

More state tests (onStart/Stop tests). Also made it more explicit that onStop's are called even if there's no HTTP server.

Files:

• trunk/cherrypy/_cpserver.py (modified) (2 diffs)
• trunk/cherrypy/_cputil.py (modified) (previous)
• trunk/cherrypy/test/test_states.py (modified) (9 diffs)

trunk/cherrypy/_cpserver.py

@@ -222 +222 @@
-        """Stop, including any HTTP servers."""
-        self.stop_http_server()
+        
+        for thread_ident, i in seen_threads.iteritems():
+            for func in self.onStopThreadList:
+                func(i)
+        seen_threads.clear()
+        
+        for func in self.onStopServerList:
+            func()
+        
-        self.state = STOPPED
-        cherrypy.log("CherryPy shut down", "HTTP")
@@ -235 +244 @@
-            httpstop()
-            cherrypy.log("HTTP Server shut down", "HTTP")
-        
-        for thread_ident, i in seen_threads.iteritems():
-            for func in self.onStopThreadList:
-                func(i)
-        seen_threads.clear()
-        
-        for func in self.onStopServerList:
-            func()
-        
-        self.httpserver = None

trunk/cherrypy/test/test_states.py

@@ -55 +55 @@
-})
-
+class Dependency:
+    
+    def __init__(self):
+        self.running = False
+        self.startcount = 0
+        self.threads = {}
+    
+    def start(self):
+        self.running = True
+        self.startcount += 1
+    
+    def stop(self):
+        self.running = False
+    
+    def startthread(self, thread_id):
+        self.threads[thread_id] = None
+    
+    def stopthread(self, thread_id):
+        del self.threads[thread_id]
+
-
-import helper
-
-
-class ServerStateTests(helper.CPWebCase):
@@ -66 +85 @@
-        self.assertRaises(cherrypy.NotReady, self.getPage, "/")
-        
+        # And our db_connection should not be running
+        self.assertEqual(db_connection.running, False)
+        self.assertEqual(db_connection.startcount, 0)
+        self.assertEqual(len(db_connection.threads), 0)
+        
-        # Test server start
-        cherrypy.server.start(True, self.serverClass)
@@ -75 +99 @@
-            self.assertRaises(IOError, cherrypy._cpserver.check_port, host, port)
-        
+        # The db_connection should be running now
+        self.assertEqual(db_connection.running, True)
+        self.assertEqual(db_connection.startcount, 1)
+        self.assertEqual(len(db_connection.threads), 0)
+        
-        self.getPage("/")
-        self.assertBody("Hello World")
+        self.assertEqual(len(db_connection.threads), 1)
-        
-        # Test server stop
@@ -84 +114 @@
-        # Once the server has stopped, we should get a NotReady error again.
-        self.assertRaises(cherrypy.NotReady, self.getPage, "/")
+        
+        # Verify that the onStopServer function was called
+        self.assertEqual(db_connection.running, False)
+        self.assertEqual(len(db_connection.threads), 0)
-    
-    def test_1_Restart(self):
-        # Test server start
-        cherrypy.server.start(True, self.serverClass)
+        
+        # The db_connection should be running now
+        self.assertEqual(db_connection.running, True)
+        sc = db_connection.startcount
+        
-        self.getPage("/")
-        self.assertBody("Hello World")
+        self.assertEqual(len(db_connection.threads), 1)
-        
-        # Test server restart from this thread
@@ -96 +135 @@
-        self.getPage("/")
-        self.assertBody("Hello World")
+        self.assertEqual(db_connection.running, True)
+        self.assertEqual(db_connection.startcount, sc + 1)
+        self.assertEqual(len(db_connection.threads), 1)
-        
-        # Test server restart from inside a page handler
@@ -101 +143 @@
-        self.assertEqual(cherrypy.server.state, 1)
-        self.assertBody("app was restarted succesfully")
+        self.assertEqual(db_connection.running, True)
+        self.assertEqual(db_connection.startcount, sc + 2)
+        # Since we are requesting synchronously, is only one thread used?
+        # Note that the "/restart" request has been flushed.
+        self.assertEqual(len(db_connection.threads), 0)
-        
-        cherrypy.server.stop()
-        self.assertEqual(cherrypy.server.state, 0)
+        self.assertEqual(db_connection.running, False)
+        self.assertEqual(len(db_connection.threads), 0)
-    
-    def test_2_KeyboardInterrupt(self):
@@ -120 +169 @@
-            self.assertEqual(cherrypy.server.state, 0)
-            self.assertRaises(cherrypy.NotReady, self.getPage, "/")
+            self.assertEqual(db_connection.running, False)
+            self.assertEqual(len(db_connection.threads), 0)
-            
-            # Raise a keyboard interrupt in a page handler; on multithreaded
@@ -136 +187 @@
-            self.assertEqual(cherrypy.server.state, 0)
-            self.assertRaises(cherrypy.NotReady, self.getPage, "/")
-
+
+
+
+
+
-
-def run(server, conf):
@@ -143 +198 @@
-    suite = helper.CPTestLoader.loadTestsFromTestCase(ServerStateTests)
-    try:
+        global db_connection
+        db_connection = Dependency()
+        cherrypy.server.onStartServerList.append(db_connection.start)
+        cherrypy.server.onStopServerList.append(db_connection.stop)
+        cherrypy.server.onStartThreadList.append(db_connection.startthread)
+        cherrypy.server.onStopThreadList.append(db_connection.stopthread)
+        
-        helper.CPTestRunner.run(suite)
-    finally: