Changeset Navigation

Changeset 980

Timestamp:

02/22/06 01:55:52

Author:

fumanchu

Message:

server.stop() works now even if init_only is False.

Files:

r976	r980
109	109
110	110	def block(self):
111		"""Block forever (wait for KeyboardInterrupt or SystemExit)."""
	111	"""Block forever (wait for stop(), KeyboardInterrupt or SystemExit)."""
112	112	try:
113		while ~~True~~:
	113	while self.state != STOPPED:
114	114	time.sleep(.1)
115	115	if self.interrupt:

r977	r980
128	128	def wait_for_http_ready(self):
129	129	if self.httpserver:
130		while not getattr(self.httpserver, "ready", True) and not self.interrupt:
	130	while (not getattr(self.httpserver, "ready", True)
	131	and not self.interrupt
	132	and self.state != STOPPED):
131	133	time.sleep(.1)
132	134

r973	r980
96	96	# then the connection should not even be processed).
97	97	self.assertRaises(cherrypy.NotReady, self.getPage, "/")
	98
	99	# Block the main thread now and verify that stop() works.
	100	def stoptest():
	101	self.getPage("/")
	102	self.assertBody("Hello World")
	103	cherrypy.server.stop()
	104	cherrypy.server.start_with_callback(stoptest, server_class=self.server_class)
	105	self.assertEqual(cherrypy.server.state, 0)
98	106
99	107	def test_1_Restart(self):