Changeset 696

Timestamp:

09/30/05 10:38:58

Author:

fumanchu

Message:

Another state test: restart within a page handler.

Files:

• trunk/cherrypy/test/test_states.py (modified) (5 diffs)

trunk/cherrypy/test/test_states.py

@@ -40 +40 @@
-        raise KeyboardInterrupt()
-    ctrlc.exposed = True
+    
+    def restart(self):
+        cherrypy.server.restart()
+        return "app was restarted succesfully"
+    restart.exposed = True
-
-cherrypy.root = Root()
@@ -111 +116 @@
-        self.assertBody("Hello World")
-        
-
+ from this thread
-        cherrypy.server.restart()
-        self.assertEqual(cherrypy._appserver_state, 1)
-        self.getPage("/")
-        self.assertBody("Hello World")
+        
+        # Test server restart from inside a page handler
+        self.getPage("/restart")
+        self.assertEqual(cherrypy._appserver_state, 1)
+        self.assertBody("app was restarted succesfully")
-        
-        # Now that we've restarted, test a KeyboardInterrupt (ticket 321).
@@ -127 +137 @@
-            # Once the server has stopped, we should get a NotReady error again.
-            self.assertRaises(cherrypy.NotReady, self.getPage, "/")
+
-
-
@@ -144 +155 @@
-            'server.socketPort': 8000,
-            'server.threadPool': 10,
-Fals
+Tru
-            'server.logConfigOptions': False,
-            'server.environment': "production",
@@ -155 +166 @@
-    _run(None)
-    _run("cherrypy._cpwsgi.WSGIServer")
-
-
-
+##
+##
+##
-