Changeset 1451
- Timestamp:
- 11/27/06 14:58:49
- Files:
-
- trunk/cherrypy/test/test_states.py (modified) (2 diffs)
- trunk/cherrypy/test/test_states_demo.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/test/test_states.py
r1450 r1451 236 236 port = cherrypy.server.socket_port 237 237 cherrypy._cpserver.wait_for_free_port(host, port) 238 os.spawnl(os.P_NOWAIT, sys.executable, sys.executable, 239 demoscript, host, str(port)) 238 if self.scheme == "https": 239 os.spawnl(os.P_NOWAIT, sys.executable, sys.executable, 240 demoscript, host, str(port), '-ssl') 241 else: 242 os.spawnl(os.P_NOWAIT, sys.executable, sys.executable, 243 demoscript, host, str(port)) 240 244 cherrypy._cpserver.wait_for_occupied_port(host, port) 241 245 … … 307 311 conf['server.ssl_certificate'] = serverpem 308 312 conf['server.ssl_private_key'] = serverpem 309 ServerStateTests.scheme = ="https"313 ServerStateTests.scheme = "https" 310 314 ServerStateTests.HTTP_CONN = httplib.HTTPSConnection 311 315 trunk/cherrypy/test/test_states_demo.py
r1275 r1451 22 22 23 23 if __name__ == '__main__': 24 cherrypy.config.update({"server.socket_host": sys.argv[1], 25 "server.socket_port": int(sys.argv[2]), 26 "log.screen": False, 27 }) 28 cherrypy.quickstart(Root()) 29 24 conf = {"server.socket_host": sys.argv[1], 25 "server.socket_port": int(sys.argv[2]), 26 "log.screen": False, 27 } 28 29 if sys.argv[3:] == ['-ssl']: 30 localDir = os.path.dirname(__file__) 31 serverpem = os.path.join(os.getcwd(), localDir, 'test.pem') 32 conf['server.ssl_certificate'] = serverpem 33 conf['server.ssl_private_key'] = serverpem 34 35 cherrypy.quickstart(Root(), config={'global': conf})
