Changeset 1329

Timestamp:

09/03/06 18:38:48

Author:

fumanchu

Message:

Fixes to test_states.

Files:

• trunk/cherrypy/_cpengine.py (modified) (2 diffs)
• trunk/cherrypy/_cprequest.py (modified) (1 diff)
• trunk/cherrypy/test/test_core.py (modified) (1 diff)
• trunk/cherrypy/test/test_states.py (modified) (1 diff)

trunk/cherrypy/_cpengine.py

@@ -87 +87 @@
-        """Block forever (wait for stop(), KeyboardInterrupt or SystemExit)."""
-        try:
-            if self.autoreload_on:
-                i = 0
-                freq = self.autoreload_frequency
-            
-            while self.state != STOPPED:
-time.sleep(.1)
-
-# Autoreload
+# Note that autoreload_frequency controls
+# sleep timer even if autoreload is off.
+time.sleep(self.autoreload_frequency)
-                if self.autoreload_on:
-
-
-
-
+
-        except KeyboardInterrupt:
-            cherrypy.log("<Ctrl-C> hit: shutting down app engine", "ENGINE")
@@ -220 +213 @@
-            for req, resp in self.servings:
-                resp.check_timeout()
-    
-    
-    
+
+
+
-    
-    def start_with_callback(self, func, args=None, kwargs=None):

trunk/cherrypy/_cprequest.py

@@ -530 +530 @@
-            finally:
-                self.hooks.run('on_end_resource')
-cherrypy.InternalRedirect
+(KeyboardInterrupt, SystemExit, cherrypy.InternalRedirect)
-            raise
-        except:

trunk/cherrypy/test/test_core.py

@@ -648 +648 @@
-        self.assertInBody(msg)
-        
-
-
+
+
+
+
-            # Test throw_errors (ticket #186).
-            self.getPage("/error/rethrow")

trunk/cherrypy/test/test_states.py

@@ -40 +40 @@
-cherrypy.config.update({
-    'environment': 'test_suite',
-deadlock.
-deadlock
+engine.deadlock_
+response
-    })
-