Changeset 1810

Timestamp:

10/29/07 16:24:31

Author:

fumanchu

Message:

New test and fix for errors during engine.start().

Files:

• trunk/cherrypy/restsrv/wspbus.py (modified) (1 diff)
• trunk/cherrypy/test/test_states.py (modified) (1 diff)
• trunk/cherrypy/test/test_states_demo.py (modified) (1 diff)

trunk/cherrypy/restsrv/wspbus.py

@@ -150 +150 @@
-        self.state = states.STARTING
-        self.log('Bus starting')
-
+
+
+
+
+
+
+
+
+
-        self.state = states.STARTED
-    

trunk/cherrypy/test/test_states.py

@@ -307 +307 @@
-            if x.args != (10, 'No child processes'):
-                raise
+    
+    def test_5_Start_Error(self):
+        if not self.server_class:
+            print "skipped (no server) ",
+            return
+        
+        # Start the demo script in a new process
+        demoscript = os.path.join(os.getcwd(), os.path.dirname(__file__),
+                                  "test_states_demo.py")
+        host = cherrypy.server.socket_host
+        port = cherrypy.server.socket_port
+        
+        # If a process errors during start, it should stop the engine
+        # and exit with a non-zero exit code.
+        args = [sys.executable, demoscript, host, str(port), '-starterror']
+        if self.scheme == "https":
+            args.append('-ssl')
+        exit_code = os.spawnl(os.P_WAIT, sys.executable, *args)
+        if exit_code == 0:
+            self.fail("Process failed to return nonzero exit code.")
-
-

trunk/cherrypy/test/test_states_demo.py

@@ -63 +63 @@
-    cherrypy.engine.subscribe('start', cherrypy.server.quickstart)
-    
+    if '-starterror' in sys.argv[3:]:
+        cherrypy.engine.subscribe('start', lambda: 1/0)
+    
-    # This is in a special order for a reason:
-    # it allows test_states to wait_for_occupied_port