Changeset Navigation

Changeset 1488

Timestamp:

12/09/06 13:32:56

Author:

fumanchu

Message:

2.x backport of [1099] (fixed a bug in TestHarness?? (no base conf when using --profile)).

Files:

r1022	r1488
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	'server.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):