Changeset 2004

Timestamp:

06/30/08 12:00:35

Author:

fumanchu

Message:

New helper.CPProcess class (moved from test_states), plus a bugfix to allow Ctrl-C to stop CP when running tests in --server mode.

Files:

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

trunk/cherrypy/test/helper.py

@@ -19 +19 @@
-# or vice-versa, unless you *really* know what you're doing.
-
+import os
+thisdir = os.path.abspath(os.path.dirname(__file__))
-import re
-import sys
-import thread
+import time
-import warnings
-
@@ -180 +183 @@
-def testmain(conf=None):
-    """Run __main__ as a test module, with webtest debugging."""
+    engine = cherrypy.engine
-    if '--server' in sys.argv:
-        # Run the test module server-side only; wait for Ctrl-C to break.
@@ -185 +189 @@
-        conf['server.socket_host'] = '0.0.0.0'
-        setConfig(conf)
-
-
+
+
+
+
+
+
-    else:
-        for arg in sys.argv:
@@ -204 +212 @@
-            conf['server.socket_host'] = '127.0.0.1'
-            setConfig(conf)
-cherrypy.
-cherrypy.
+
+
-
-def _test_main_thread():
@@ -214 +222 @@
-        cherrypy.engine.exit()
-
+
+
+# --------------------------- Spawning helpers --------------------------- #
+
+
+class CPProcess(object):
+    
+    pid_file = os.path.join(thisdir, 'test.pid')
+    config_file = os.path.join(thisdir, 'test.conf')
+    config_template = """[global]
+server.socket_host: '%(host)s'
+server.socket_port: %(port)s
+log.screen: False
+log.error_file: r'%(error_log)s'
+log.access_file: r'%(access_log)s'
+%(ssl)s
+%(extra)s
+"""
+    error_log = os.path.join(thisdir, 'test.error.log')
+    access_log = os.path.join(thisdir, 'test.access.log')
+    
+    def __init__(self, wait=False, daemonize=False, ssl=False):
+        self.wait = wait
+        self.daemonize = daemonize
+        self.ssl = ssl
+        self.host = cherrypy.server.socket_host
+        self.port = cherrypy.server.socket_port
+    
+    def write_conf(self, extra=""):
+        if self.ssl:
+            serverpem = os.path.join(thisdir, 'test.pem')
+            ssl = """
+server.ssl_certificate: r'%s'
+server.ssl_private_key: r'%s'
+""" % (serverpem, serverpem)
+        else:
+            ssl = ""
+        
+        f = open(self.config_file, 'wb')
+        f.write(self.config_template %
+                {'host': self.host,
+                 'port': self.port,
+                 'error_log': self.error_log,
+                 'access_log': self.access_log,
+                 'ssl': ssl,
+                 'extra': extra,
+                 })
+        f.close()
+    
+    def start(self, imports=None):
+        """Start cherryd in a subprocess."""
+        cherrypy._cpserver.wait_for_free_port(self.host, self.port)
+        
+        args = [sys.executable, os.path.join(thisdir, '..', 'cherryd'),
+                '-c', self.config_file, '-p', self.pid_file]
+        
+        if not isinstance(imports, (list, tuple)):
+            imports = [imports]
+        for i in imports:
+            if i:
+                args.append('-i')
+                args.append(i)
+        
+        if self.daemonize:
+            args.append('-d')
+        
+        if self.wait:
+            self.exit_code = os.spawnl(os.P_WAIT, sys.executable, *args)
+        else:
+            os.spawnl(os.P_NOWAIT, sys.executable, *args)
+            cherrypy._cpserver.wait_for_occupied_port(self.host, self.port)
+        
+        # Give the engine a wee bit more time to finish STARTING
+        if self.daemonize:
+            time.sleep(2)
+        else:
+            time.sleep(1)
+    
+    def get_pid(self):
+        return int(open(self.pid_file, 'rb').read())
+    
+    def join(self):
+        """Wait for the process to exit."""
+        try:
+            try:
+                # Mac, UNIX
+                os.wait()
+            except AttributeError:
+                # Windows
+                try:
+                    pid = self.get_pid()
+                except IOError:
+                    # Assume the subprocess deleted the pidfile on shutdown.
+                    pass
+                else:
+                    os.waitpid(pid, 0)
+        except OSError, x:
+            if x.args != (10, 'No child processes'):
+                raise
+

trunk/cherrypy/test/test_states.py

@@ -13 +13 @@
-engine = cherrypy.engine
-thisdir = os.path.join(os.getcwd(), os.path.dirname(__file__))
-PID_file_path = os.path.join(thisdir, 'pid_for_test_daemonize')
-
-
-def write_conf(scheme='http', extra=""):
-    if scheme.lower() == 'https':
-        serverpem = os.path.join(thisdir, 'test.pem')
-        ssl = """
-server.ssl_certificate: r'%s'
-server.ssl_private_key: r'%s'
-""" % (serverpem, serverpem)
-    else:
-        ssl = ""
-    
-    conffile = open(os.path.join(thisdir, 'test_states.conf'), 'wb')
-    conffile.write("""[global]
-server.socket_host: '%(host)s'
-server.socket_port: %(port)s
-log.screen: False
-log.error_file: r'%(error_log)s'
-log.access_file: r'%(access_log)s'
-%(ssl)s
-%(extra)s
-""" % {'host': host,
-       'port': port,
-       'error_log': os.path.join(thisdir, 'test_states_demo.error.log'),
-       'access_log': os.path.join(thisdir, 'test_states_demo.access.log'),
-       'ssl': ssl,
-       'extra': extra,
-       })
-    conffile.close()
-
-
-def spawn_cp(configfile=os.path.join(thisdir, 'test_states.conf'),
-             wait=False, daemonize=False):
-    """Start cherryd in a subprocess."""
-    host = cherrypy.server.socket_host
-    port = cherrypy.server.socket_port
-    cherrypy._cpserver.wait_for_free_port(host, port)
-    
-    args = [sys.executable, os.path.join(thisdir, '..', 'cherryd'),
-            '-c', configfile, '-i', 'cherrypy.test.test_states_demo']
-    
-    if sys.platform != 'win32':
-        args.append('-p')
-        args.append(PID_file_path)
-    
-    # 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.
-    if daemonize:
-        args.append('-d')
-    
-    if wait:
-        result = os.spawnl(os.P_WAIT, sys.executable, *args)
-    else:
-        result = os.spawnl(os.P_NOWAIT, sys.executable, *args)
-        cherrypy._cpserver.wait_for_occupied_port(host, port)
-    
-    # Give the engine a wee bit more time to finish STARTING
-    if daemonize:
-        time.sleep(2)
-    else:
-        time.sleep(1)
-    
-    return result
-
-def wait(pid):
-    """Wait for the process with the given pid to exit."""
-    try:
-        try:
-            # Mac, UNIX
-            os.wait()
-        except AttributeError:
-            # Windows
-            os.waitpid(pid, 0)
-    except OSError, x:
-        if x.args != (10, 'No child processes'):
-            raise
-
-
@@ -342 +264 @@
-        
-        # Start the demo script in a new process
-
-
+
+
+
-        try:
-            self.getPage("/start")
@@ -357 +280 @@
-            time.sleep(2)
-            cherrypy._cpserver.wait_for_occupied_port(host, port)
-            
-            self.getPage("/pid")
-            pid = int(self.body)
-            
-            self.getPage("/start")
@@ -366 +286 @@
-            # Shut down the spawned process
-            self.getPage("/exit")
-wait(pid
+p.join(
-    
-    def test_5_Start_Error(self):
@@ -375 +295 @@
-        # If a process errors during start, it should stop the engine
-        # and exit with a non-zero exit code.
-
-
-
+
+
+
+
+
-            self.fail("Process failed to return nonzero exit code.")
-
@@ -394 +316 @@
-        # is finished.  If it daemonized properly, we should still be able
-        # to access pages.
-
-
-
-
-
+
+
+
+
-        try:
-            # Just get the pid of the daemonization process.
@@ -404 +325 @@
-            self.assertStatus(200)
-            page_pid = int(self.body)
-id
+.get_pid()
-        finally:
-            # Shut down the spawned process
-            self.getPage("/exit")
-wait(pid
+p.join(
-        
-        # 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.
-
+p.
-            self.fail("Daemonized parent process failed to exit cleanly.")
-
@@ -431 +352 @@
-        
-        # Spawn the process.
-
-
+
+
+
-        # Send a SIGHUP
-id
+.get_pid()
-        # This might hang if things aren't working right, but meh.
-wait(pid
+p.join(
-    
-    def test_SIGHUP_daemonized(self):
@@ -457 +379 @@
-        # is finished.  If it daemonized properly, we should still be able
-        # to access pages.
-
-
-
-
-
+
+
+
+
+
+
-        try:
-            # Send a SIGHUP
@@ -474 +397 @@
-            # Shut down the spawned process
-            self.getPage("/exit")
-wait(new_pid
+p.join(
-    
-    def test_SIGTERM(self):
@@ -495 +418 @@
-        
-        # Spawn a normal, undaemonized process.
-
-
+
+
+
-        # Send a SIGTERM
-id
+.get_pid()
-        # This might hang if things aren't working right, but meh.
-wait(pid
+p.join(
-        
-        if os.name in ['posix']: 
-            # Spawn a daemonized process and test again.
-
+
+
+
+
-            # Send a SIGTERM
-
-
+
-            # This might hang if things aren't working right, but meh.
-wait(pid
+p.join(
-    
-    def test_signal_handler_unsubscribe(self):
@@ -529 +455 @@
-        
-        # Spawn a normal, undaemonized process.
-
-
-
-
+
+
+
+
+
+
+
+
-        # Assert the old handler ran.
-
-
+
-        if not "I am an old SIGTERM handler." in target_line:
-            self.fail("Old SIGTERM handler did not run.\n%r" % target_line)