Changeset 1099
- Timestamp:
- 05/07/06 17:29:52
- Files:
-
- trunk/cherrypy/test/test.py (modified) (2 diffs)
- trunk/cherrypy/test/test_response_headers_filter.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/test/test.py
r1094 r1099 38 38 print 39 39 40 if conf is None: 41 conf = {'server.socket_host': '127.0.0.1', 40 if isinstance(conf, basestring): 41 conf = cherrypy.config.dict_from_config_file(conf) 42 baseconf = {'server.socket_host': '127.0.0.1', 42 43 'server.socket_port': self.port, 43 44 'server.thread_pool': 10, … … 46 47 'show_tracebacks': True, 47 48 } 48 elif isinstance(conf, basestring): 49 conf = cherrypy.config.dict_from_config_file(conf) 50 51 conf['server.protocol_version'] = self.protocol 52 self._run(conf) 49 baseconf.update(conf or {}) 50 51 baseconf['server.protocol_version'] = self.protocol 52 self._run(baseconf) 53 53 54 54 def _run(self, conf): trunk/cherrypy/test/test_response_headers_filter.py
r1096 r1099 26 26 27 27 cherrypy.tree.mount(Root()) 28 cherrypy.config.update({ 29 'log_to_screen': False, 30 'environment': 'production', 31 }) 28 32 29 33
