Changeset 2073
- Timestamp:
- 11/08/08 14:32:38
- Files:
-
- trunk/cherrypy/test/modfcgid.py (modified) (1 diff)
- trunk/cherrypy/test/modpy.py (modified) (1 diff)
- trunk/cherrypy/test/modwsgi.py (modified) (1 diff)
- trunk/cherrypy/test/test.py (modified) (1 diff)
- trunk/cherrypy/test/test_wsgi_vhost.py (modified) (1 diff)
- trunk/cherrypy/test/test_wsgiapps.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/test/modfcgid.py
r2072 r2073 105 105 106 106 def _run(self, conf): 107 cherrypy.server.using_wsgi = True 107 108 cherrypy.server.using_apache = True 108 109 cherrypy.server.httpserver = servers.FlupFCGIServer( trunk/cherrypy/test/modpy.py
r2072 r2073 170 170 171 171 if self.use_wsgi: 172 cherrypy.server.using_wsgi = True 172 173 conf_template = conf_modpython_gateway 173 174 else: 175 cherrypy.server.using_wsgi = False 174 176 conf_template = conf_cpmodpy 175 177 trunk/cherrypy/test/modwsgi.py
r2072 r2073 117 117 118 118 def _run(self, conf): 119 cherrypy.server.using_wsgi = True 119 120 cherrypy.server.using_apache = True 120 121 trunk/cherrypy/test/test.py
r2059 r2073 49 49 print "PID:", os.getpid() 50 50 print 51 52 # Override these in _run as needed: 53 cherrypy.server.using_wsgi = True 54 cherrypy.server.using_apache = False 51 55 52 56 if isinstance(conf, basestring): trunk/cherrypy/test/test_wsgi_vhost.py
r1670 r2073 35 35 36 36 def test_welcome(self): 37 if not cherrypy.server.using_wsgi: 38 print "skipped (not using WSGI)...", 39 return 40 37 41 for year in xrange(1997, 2008): 38 42 self.getPage("/", headers=[('Host', 'www.classof%s.example' % year)]) trunk/cherrypy/test/test_wsgiapps.py
r1804 r2073 89 89 90 90 def test_04_pure_wsgi(self): 91 import cherrypy 92 if not cherrypy.server.using_wsgi: 93 print "skipped (not using WSGI)...", 94 return 91 95 self.getPage("/hosted/app1") 92 96 self.assertHeader("Content-Type", "text/plain") … … 94 98 95 99 def test_05_wrapped_cp_app(self): 100 import cherrypy 101 if not cherrypy.server.using_wsgi: 102 print "skipped (not using WSGI)...", 103 return 96 104 self.getPage("/hosted/app2/") 97 105 body = list("I'm a regular CherryPy page handler!") … … 101 109 102 110 def test_06_empty_string_app(self): 111 import cherrypy 112 if not cherrypy.server.using_wsgi: 113 print "skipped (not using WSGI)...", 114 return 103 115 self.getPage("/hosted/app3") 104 116 self.assertHeader("Content-Type", "text/plain")
