Changeset 1743

Timestamp:

10/10/07 14:58:34

Author:

lakin

Message:

Test suite: added a test which re-produces the bug with daemonize that's documented in #646.

Files:

• trunk/cherrypy/test/test_states.py (modified) (8 diffs)
• trunk/cherrypy/test/test_states_demo.py (modified) (3 diffs)

trunk/cherrypy/test/test_states.py

@@ -12 +12 @@
-import cherrypy
-engine = cherrypy.engine
-
+
+
-
-class Root:
@@ -295 +296 @@
-                raise
-
+class DaemonizeTest(helper.CPWebCase):
+    def test_0_Daemonize(self):
+        if not self.server_class:
+            print "skipped (no server) ",
+            return
+        if os.name not in ['posix']: 
+            print "skipped (not on posix) ",
+            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
+        cherrypy._cpserver.wait_for_free_port(host, port)
+        
+        args = [sys.executable, demoscript, host, str(port), '-daemonize']
+        if self.scheme == "https":
+            args.append('-ssl')
+        # Spawn the process and wait, when this returns, the original process
+        # is finished.  If it daemonized properly, we should still be able
+        # to access pages.
+        exit_code = os.spawnl(os.P_WAIT, sys.executable, *args)
+        cherrypy._cpserver.wait_for_occupied_port(host, port)
+
+        # Give the server some time to start up
+        time.sleep(2)
+
+        # Get the PID from the file.
+        pid = int(open(PID_file_path).read())
+        try:
+            # Just get the pid of the daemonization process.
+            self.getPage("/pid")
+            self.assertStatus(200)
+            page_pid = int(self.body)
+            self.assertEqual(page_pid, pid)
+        finally:
+            # Shut down the spawned process
+            self.getPage("/stop")
+        
+        try:
+            print os.waitpid(pid, 0)
+        except OSError, x:
+            if x.args != (10, 'No child processes'):
+                raise
+
+        # Wait until here to test the exit code because we want to ensure
+        # that we wait for the daemon to finish running before we fail.
+        if exit_code != 0:
+            self.fail("Daemonized process failed to exit cleanly")
-db_connection = None
-
@@ -300 +352 @@
-    helper.setConfig(conf)
-    ServerStateTests.server_class = server
+    DaemonizeTest.server_class = server
-    suite = helper.CPTestLoader.loadTestsFromTestCase(ServerStateTests)
+    daemon_suite = helper.CPTestLoader.loadTestsFromTestCase(DaemonizeTest)
-    try:
-        global db_connection
@@ -314 +368 @@
-        except ImportError:
-            helper.CPTestRunner.run(suite)
+            helper.CPTestRunner.run(daemon_suite)
-        else:
-            tr = pyconquer.Logger("cherrypy")
@@ -320 +375 @@
-                tr.start()
-                helper.CPTestRunner.run(suite)
+                helper.CPTestRunner.run(daemon_suite)
-            finally:
-                tr.stop()
@@ -335 +391 @@
-    
-    if host:
-
+DaemonizeTest.HOST = 
-    
-    if port:
-
+DaemonizeTest.PORT = 
-    
-    if ssl:
@@ -345 +401 @@
-        conf['server.ssl_certificate'] = serverpem
-        conf['server.ssl_private_key'] = serverpem
-
-
+DaemonizeTest.scheme = 
+DaemonizeTest.HTTP_CONN = 
-    
-    def _run(server):
@@ -353 +409 @@
-        run(server, conf)
-    _run("cherrypy._cpwsgi.CPWSGIServer")
-
-
-
-if __name__ == "__main__":

trunk/cherrypy/test/test_states_demo.py

@@ -5 +5 @@
-
-import cherrypy
-
+
+
+
-
-class Root:
@@ -29 +31 @@
-    stop.exposed = True
-
-
-if __name__ == '__main__':
-    conf = {"server.socket_host": sys.argv[1],
@@ -36 +37 @@
-            }
-    
-sys.argv[3:] == ['-ssl'
+'-ssl' in sys.argv[3:
-        localDir = os.path.dirname(__file__)
-        serverpem = os.path.join(os.getcwd(), localDir, 'test.pem')
-        conf['server.ssl_certificate'] = serverpem
-        conf['server.ssl_private_key'] = serverpem
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    # This is in a special order for a reason:
-    # it allows test_states to wait_for_occupied_port
-    # and then immediately call getPage without getting 503.
-
-
-
-
-
+
+
+
+
+
+
+
+