Changeset 1755

Timestamp:

10/18/07 16:59:36

Author:

fumanchu

Message:

Some fixes to test_states.

Files:

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

trunk/cherrypy/restsrv/plugins.py

@@ -412 +412 @@
-        self.threads = {}
-        self.bus = bus
+        self.bus.listeners.setdefault('acquire_thread', set())
+        self.bus.listeners.setdefault('release_thread', set())
-    
-    def acquire_thread(self):

trunk/cherrypy/test/test_states.py

@@ -13 +13 @@
-engine = cherrypy.engine
-thisdir = os.path.join(os.getcwd(), os.path.dirname(__file__))
-
+
+
-
-class Root:
@@ -50 +51 @@
-class Dependency:
-    
-
+
+
-        self.running = False
-        self.startcount = 0
@@ -56 +58 @@
-        self.threads = {}
-    
+    def subscribe(self):
+        self.bus.subscribe('start', self.start)
+        self.bus.subscribe('stop', self.stop)
+        self.bus.subscribe('graceful', self.graceful)
+        self.bus.subscribe('start_thread', self.startthread)
+        self.bus.subscribe('stop_thread', self.stopthread)
+    
-    def start(self):
-        self.running = True
@@ -71 +80 @@
-    def stopthread(self, thread_id):
-        del self.threads[thread_id]
+
+db_connection = Dependency(engine)
+db_connection.subscribe()
-
-
@@ -219 +231 @@
-        cherrypy.server.start()
-        try:
-_
+
-            
-            # Request a "normal" page.
-_
+
-            self.getPage("/")
-            self.assertBody("Hello World")
-            # request.close is called async.
-_
+
-                print ".",
-                time.sleep(0.01)
@@ -296 +308 @@
-                raise
-
+
-class DaemonizeTest(helper.CPWebCase):
-
+
+
-        if not self.server_class:
-            print "skipped (no server) ",
@@ -304 +318 @@
-            print "skipped (not on posix) ",
-            return
-
-
+
-        # Start the demo script in a new process
-        demoscript = os.path.join(os.getcwd(), os.path.dirname(__file__),
@@ -321 +334 @@
-        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())
@@ -342 +355 @@
-            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")
-
+
-
-def run(server, conf):
@@ -356 +369 @@
-    daemon_suite = helper.CPTestLoader.loadTestsFromTestCase(DaemonizeTest)
-    try:
-        global db_connection
-        db_connection = Dependency()
-        engine.subscribe('start', db_connection.start)
-        engine.subscribe('stop', db_connection.stop)
-        engine.subscribe('graceful', db_connection.graceful)
-        engine.subscribe('start_thread', db_connection.startthread)
-        engine.subscribe('stop_thread', db_connection.stopthread)
-        
-        try:
-            import pyconquer

trunk/cherrypy/test/test_states_demo.py

@@ -5 +5 @@
-
-import cherrypy
-.plugins import daemonize, PIDFile
+ import plugins
-thisdir = os.path.join(os.getcwd(), os.path.dirname(__file__))
-
+
+
-
-class Root:
@@ -55 +56 @@
-                raise SystemExit(1)
-        sys.exitfunc = exitfunc
-
-cherrypy.engine.subscribe('start', daemonize
-id_file = PIDFile(cherrypy.engine, PID_file_path
-
+
+plugins.Daemonizer(cherrypy.engine).subscribe(
+lugins.PIDFile(cherrypy.engine, PID_file_path).subscribe(
+
-    cherrypy.engine.subscribe('start', cherrypy.server.quickstart)   
-
+
-    # This is in a special order for a reason:
-    # it allows test_states to wait_for_occupied_port