Commits

Robert Brewer committed 09e9079

Fix to cpmodpy for latest Bus, plus some test fixes for mod_python runs.

Comments (0)

Files changed (2)

cherrypy/_cpmodpy.py

                             "tools.ignore_headers.headers": ['Range'],
                             })
     
-    engine = cherrypy.engine
-    engine.start()
-    engine.block(engine.states.STARTED)
+    cherrypy.engine.start()
     
     def cherrypy_cleanup(data):
         cherrypy.engine.stop()

cherrypy/test/test_httpauth.py

 
     def testBasic(self):
         self.getPage("/basic/")
-        self.assertStatus('401 Unauthorized')
+        self.assertStatus(401)
         self.assertHeader('WWW-Authenticate', 'Basic realm="localhost"')
 
         self.getPage('/basic/', [('Authorization', 'Basic dGVzdDp0ZX60')])
-        self.assertStatus('401 Unauthorized')
+        self.assertStatus(401)
         
         self.getPage('/basic/', [('Authorization', 'Basic dGVzdDp0ZXN0')])
         self.assertStatus('200 OK')
 
     def testBasic2(self):
         self.getPage("/basic2/")
-        self.assertStatus('401 Unauthorized')
+        self.assertStatus(401)
         self.assertHeader('WWW-Authenticate', 'Basic realm="localhost"')
 
         self.getPage('/basic2/', [('Authorization', 'Basic dGVzdDp0ZX60')])
-        self.assertStatus('401 Unauthorized')
+        self.assertStatus(401)
         
         self.getPage('/basic2/', [('Authorization', 'Basic dGVzdDp0ZXN0')])
         self.assertStatus('200 OK')
 
     def testDigest(self):
         self.getPage("/digest/")
-        self.assertStatus('401 Unauthorized')
+        self.assertStatus(401)
         
         value = None
         for k, v in self.headers: