Skip to content

Commit fec2523

Browse files
committed
[tornado] fix unit tests
1 parent d39204f commit fec2523

File tree

4 files changed

+19
-5
lines changed

4 files changed

+19
-5
lines changed

ioc/extra/tornado/command.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ def execute(self, args, output):
2020
output.write("Configuring tornado (event: ioc.extra.tornado.start)\n")
2121

2222
self.event_dispatcher.dispatch('ioc.extra.tornado.start', {
23-
'application': self.application
23+
'application': self.application,
24+
'output': output
2425
})
2526

2627
output.write("Starting tornado %s:%s (bind to: %s)\n" % (args.address, args.port, args.bind))

ioc/extra/tornado/di.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ def load(self, config, container_builder):
1010
loader = ioc.loader.YamlLoader()
1111
loader.load("%s/resources/config/services.yml" % path, container_builder)
1212

13-
container_builder.parameters.set('ioc.extra.tornado.port', config.get('port', 8888))
1413
container_builder.parameters.set('ioc.extra.tornado.static_folder', config.get('static_folder', '%project.root_folder%/resources/static'))
1514
container_builder.parameters.set('ioc.extra.tornado.static_public_path', config.get('static_public_path', '/static'))
1615

ioc/extra/tornado/handler.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@ def initialize(self, router, event_dispatcher, logger=None):
4949

5050
@tornado.web.asynchronous
5151
def dispatch(self):
52-
5352
result = None
54-
# the handler.request might close the connection
53+
# the handler.request event might close the connection
5554
if self.is_finish():
5655
return
5756

tests/ioc/extra/tornado/test_handler.py

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from ioc.extra.tornado.router import Router
77
from ioc.extra.tornado.handler import RouterHandler
88

9+
910
def view(handler, name=None):
1011
handler.write("Hello %s" % name)
1112

@@ -14,11 +15,24 @@ def error(handler):
1415

1516
class MyHTTPTest(AsyncHTTPTestCase):
1617
def get_app(self):
18+
19+
dispatcher = Dispatcher()
20+
21+
def error_listener(event):
22+
event.get('request_handler').write('An unexpected error occurred')
23+
24+
def not_found_listener(event):
25+
event.get('request_handler').write('Not Found')
26+
27+
dispatcher.add_listener('handler.not_found', not_found_listener)
28+
dispatcher.add_listener('handler.exception', error_listener)
29+
30+
1731
router = Router()
1832
router.add("hello", "/hello/<string:name>", view, methods=['GET'])
1933
router.add("exception", "/exception", error, methods=['GET'])
2034

21-
return Application([("/.*", RouterHandler, dict(router=router, event_dispatcher=Dispatcher()))])
35+
return Application([("/.*", RouterHandler, dict(router=router, event_dispatcher=dispatcher))])
2236

2337
def test_not_found(self):
2438
response = self.fetch('/')
@@ -32,5 +46,6 @@ def test_found(self):
3246

3347
def test_error(self):
3448
response = self.fetch('/exception')
49+
3550
self.assertEquals("An unexpected error occurred", response.body[0:28])
3651
self.assertEquals(500, response.code)

0 commit comments

Comments
 (0)