Changeset 1815

Timestamp:

11/02/07 17:23:02

Author:

lakin

Message:

Adding a unit test which exposes a bug whereby CP exit codes are mistakenly set to 0 by Daemonizer even if there are pending startup errors waiting to be raised.

Files:

• trunk/cherrypy/test/test_states.py (modified) (1 diff)
• trunk/cherrypy/test/test_states_demo.py (modified) (2 diffs)

trunk/cherrypy/test/test_states.py

@@ -328 +328 @@
-            self.fail("Process failed to return nonzero exit code.")
-
+    def test_6_Start_Error_With_Daemonize(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, even if we daemonize soon
+        # thereafter.
+        args = [sys.executable, demoscript, host, str(port), '-starterror', '-daemonize']
+        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.")
+        time.sleep(2) # Wait for the daemonized process to exit.
+
-
-class DaemonizeTest(helper.CPWebCase):

trunk/cherrypy/test/test_states_demo.py

@@ -37 +37 @@
-            "server.socket_port": int(sys.argv[2]),
-            "log.screen": False,
+            "log.error_file": os.path.join(thisdir, 'test_states_demo.error.log'),
-            }
-    
@@ -61 +62 @@
-        plugins.PIDFile(cherrypy.engine, PID_file_path).subscribe()
-    
-
+, priority=75
-    
-    if '-starterror' in sys.argv[3:]:
-
+, priority=6
-    
-    # This is in a special order for a reason: