Merge 073aca6 into 2b8b742

requirements.txt

@@ -1,3 +1,3 @@
-tornado >=4.2.1,<4.5.0
+tornado >=4.2.1,<=5.0
 schematics == 1.1.1
 scales == 1.0.9

supercell/service.py

@@ -112,12 +112,12 @@ def main(self, with_signals=True):
 
         if with_signals:
             def sig_handler(sig, frame):
-                IOLoop.instance().add_callback(self.shutdown)    # noqa
+                IOLoop.current().add_callback(self.shutdown)    # noqa
             signal.signal(signal.SIGTERM, sig_handler)
             signal.signal(signal.SIGINT, sig_handler)
 
         self.slog.info('Starting supercell')
-        IOLoop.instance().start()
+        IOLoop.current().start()
 
     def shutdown(self):
         """Gaceful shutdown of the server.
@@ -127,7 +127,7 @@ def shutdown(self):
         current requests are allowed to finish. After this period the `IOLoop`
         is stopped.
         """
-        io_loop = IOLoop.instance()
+        io_loop = IOLoop.current()
         self.slog.info('Stopping HTTP server')
         self.server.stop()
 

supercell/testing.py

@@ -36,7 +36,8 @@ def set_commandline(self, monkeypatch):
         monkeypatch.setattr(sys, 'argv', ['pytest'] + self.ARGV)
 
     def get_new_ioloop(self):
-        return IOLoop.instance()
+        return IOLoop.current\
+            ()
 
     def get_app(self):
         service = self.SERVICE()

test/test_cache.py

@@ -22,7 +22,6 @@
 from schematics.types import StringType
 
 from tornado import gen
-from tornado.ioloop import IOLoop
 from tornado.testing import AsyncHTTPTestCase
 
 import supercell.api as s
@@ -94,9 +93,6 @@ def get(self, *args, **kwargs):
 
 class TestCacheDecorator(AsyncHTTPTestCase):
 
-    def get_new_ioloop(self):
-        return IOLoop.instance()
-
     def get_app(self):
         env = Environment()
         env.add_handler(r'/', MyHandler,

test/test_environment.py

@@ -24,6 +24,7 @@
 else:
     from unittest2 import TestCase
 
+from tornado import httputil
 from tornado.web import Application, RequestHandler
 
 from supercell.environment import Environment
@@ -35,7 +36,7 @@ def test_simple_app_creation(self):
         env = Environment()
         app = env.get_application()
         self.assertIsInstance(app, Application)
-        self.assertEqual(len(app.handlers), 2)
+        self.assertEqual(len(app.default_router.rules), 3)
 
     def test_config_file_paths(self):
         env = Environment()
@@ -54,13 +55,11 @@ def get(self):
         self.assertEqual(len(env._handlers), 1)
 
         app = env.get_application()
-        self.assertEqual(len(app.handlers), 3)
-        (host_pattern, [spec]) = [h for h in app.handlers
-                                  if not h[1][0].regex.pattern.startswith(
-                                      '/_system')][0]
-        self.assertEqual(host_pattern.pattern, '.*$')
-        self.assertEqual(spec.regex.pattern, '/test$')
-        self.assertEqual(spec.handler_class, MyHandler)
+
+        request = httputil.HTTPServerRequest(uri='/test')
+        handler_delegate = app.default_router.find_handler(request)
+        self.assertIsNotNone(handler_delegate)
+        self.assertEqual(handler_delegate.handler_class, MyHandler)
 
     def test_managed_object_access(self):
         env = Environment()

test/test_healthchecks.py

@@ -20,7 +20,6 @@
 
 import json
 
-from tornado.ioloop import IOLoop
 from tornado.testing import AsyncHTTPTestCase
 
 from supercell.health import SystemHealthCheck
@@ -30,9 +29,6 @@
 
 class TestBasicHealthChecks(AsyncHTTPTestCase):
 
-    def get_new_ioloop(self):
-        return IOLoop.instance()
-
     def get_app(self):
         env = Environment()
         env.add_handler('/_system/check', SystemHealthCheck)
@@ -63,9 +59,6 @@ def get(self):
 
 class TestCustomHealthCheck(AsyncHTTPTestCase):
 
-    def get_new_ioloop(self):
-        return IOLoop.instance()
-
     def get_app(self):
         env = Environment()
         env.add_health_check('test', SimpleHealthCheckExample)

test/test_middleware.py

@@ -20,7 +20,6 @@
 
 import json
 
-from tornado.ioloop import IOLoop
 from tornado.testing import AsyncHTTPTestCase
 
 from schematics.models import Model
@@ -126,9 +125,6 @@ def get_app(self):
         env.add_handler('/otherresult', MyHandlerReturningOtherStuff)
         return env.get_application()
 
-    def get_new_ioloop(self):
-        return IOLoop.instance()
-
     def test_that_header_exists(self):
         response = self.fetch('/test')
 

test/test_queryparam.py

@@ -24,7 +24,6 @@
 from schematics.types import StringType
 from schematics.types import IntType
 
-from tornado.ioloop import IOLoop
 from tornado.testing import AsyncHTTPTestCase
 
 import supercell.api as s
@@ -78,9 +77,6 @@ def get_app(self):
         env.tornado_settings['debug'] = True
         return env.get_application()
 
-    def get_new_ioloop(self):
-        return IOLoop.instance()
-
     def test_simple_params(self):
         response = self.fetch('/test?docid=1&message=A%20test')
 

test/test_requesthandler.py

@@ -30,7 +30,6 @@
 from schematics.types.compound import ListType
 from schematics.types.compound import ModelType
 
-from tornado.ioloop import IOLoop
 from tornado.testing import AsyncHTTPTestCase
 
 import supercell.api as s
@@ -99,9 +98,6 @@ def get_app(self):
         env.add_handler('/test_echo', MyEchoHandler)
         return env.get_application()
 
-    def get_new_ioloop(self):
-        return IOLoop.instance()
-
     def test_simple_handler(self):
         response = self.fetch('/test', headers={'Accept':
                                                 s.MediaType.ApplicationJson})
@@ -187,9 +183,6 @@ def get_app(self):
         env.add_handler('/testencoding/(.*)', EncodingTestingHandler)
         return env.get_application()
 
-    def get_new_ioloop(self):
-        return IOLoop.instance()
-
     def test_latinone_handler(self):
         response = self.fetch('/testencoding/alfredo-p%e9rez-rubalcaba')
         self.assertEqual(200, response.code)
@@ -232,9 +225,6 @@ def get(self, *args, **kwargs):
                                                         'html_test_template')
         return env.get_application()
 
-    def get_new_ioloop(self):
-        return IOLoop.instance()
-
     def test_simple_html(self):
         response = self.fetch('/test_html/')
         self.assertEqual(200, response.code)
@@ -265,9 +255,6 @@ def get(self, *args, **kwargs):
                                                         'html_test_template')
         return env.get_application()
 
-    def get_new_ioloop(self):
-        return IOLoop.instance()
-
     def test_simple_html(self):
         response = self.fetch('/test_html/')
         self.assertEqual(500, response.code)
@@ -318,9 +305,6 @@ def get(self, *args, **kwargs):
         env.add_handler('/test_partial_complex', MyHandlerWithPartialComplex)
         return env.get_application()
 
-    def get_new_ioloop(self):
-        return IOLoop.instance()
-
     def test_provide_partial_model_with_partial_false(self):
         response = self.fetch(
             '/test_no_partial',

test/test_returning_errors.py

@@ -23,7 +23,6 @@
 import pytest
 import json
 
-from tornado.ioloop import IOLoop
 from tornado.testing import AsyncHTTPTestCase
 from tornado.web import HTTPError
 
@@ -109,9 +108,6 @@ class ApplicationIntegrationTest(AsyncHTTPTestCase):
     def empty_commandline(self, monkeypatch):
         monkeypatch.setattr(sys, 'argv', [])
 
-    def get_new_ioloop(self):
-        return IOLoop.instance()
-
     def get_app(self):
         service = MyService()
         service.initialize_logging()

test/test_returning_non_model.py

@@ -22,7 +22,6 @@
 
 import pytest
 
-from tornado.ioloop import IOLoop
 from tornado.testing import AsyncHTTPTestCase
 
 from supercell.api import async
@@ -52,9 +51,6 @@ class ApplicationIntegrationTest(AsyncHTTPTestCase):
     def empty_commandline(self, monkeypatch):
         monkeypatch.setattr(sys, 'argv', [])
 
-    def get_new_ioloop(self):
-        return IOLoop.instance()
-
     def get_app(self):
         service = MyService()
         service.initialize_logging()

test/test_service.py

@@ -32,7 +32,7 @@
 from schematics.models import Model
 from schematics.types import StringType
 import tornado.options
-from supercell.testing import AsyncHTTPTestCase
+from tornado.testing import AsyncHTTPTestCase
 
 import supercell.api as s
 from supercell.environment import Environment
@@ -110,17 +110,18 @@ def test_logging_initialization(self):
 
         service.initialize_logging()
 
-    @mock.patch('tornado.ioloop.IOLoop.instance')
+    @mock.patch('tornado.ioloop.IOLoop.current')
     def test_main_method(self, ioloop_instance_mock):
         service = MyService()
         service.main()
 
-        expected = [mock.call(), mock.call().add_handler(mock.ANY, mock.ANY,
-                                                         mock.ANY),
-                    mock.call(), mock.call().start()]
-        assert expected == ioloop_instance_mock.mock_calls
+        ioloop_instance_mock.assert_called()
+        ioloop_instance_mock().start.assert_called()
+        ioloop_instance_mock().add_handler.assert_called()
+        service.shutdown()
+
 
-    @mock.patch('tornado.ioloop.IOLoop.instance')
+    @mock.patch('tornado.ioloop.IOLoop.current')
     @mock.patch('socket.fromfd')
     def test_startup_with_socket_fd(self, socket_fromfd_mock,
                                     ioloop_instance_mock):
@@ -137,8 +138,10 @@ def test_startup_with_socket_fd(self, socket_fromfd_mock,
 
         assert (mock.call(123, socket.AF_INET, socket.SOCK_STREAM)
                 in socket_fromfd_mock.mock_calls)
+        service.shutdown()
 
-    @mock.patch('tornado.ioloop.IOLoop.instance')
+
+    @mock.patch('tornado.ioloop.IOLoop.current')
     def test_graceful_shutdown_pending_callbacks(self, ioloop_instance_mock):
         service = MyService()
         service.main()
@@ -163,7 +166,7 @@ def test_graceful_shutdown_pending_callbacks(self, ioloop_instance_mock):
 
         assert expected == ioloop_instance_mock.mock_calls
 
-    @mock.patch('tornado.ioloop.IOLoop.instance')
+    @mock.patch('tornado.ioloop.IOLoop.current')
     def test_graceful_final_shutdown(self, ioloop_instance_mock):
         service = MyService()
         service.main()
@@ -181,12 +184,19 @@ def test_graceful_final_shutdown(self, ioloop_instance_mock):
         assert expected == ioloop_instance_mock.mock_calls
 
         service.config.max_grace_seconds = 3
+        service.shutdown()
 
 
 class ApplicationIntegrationTest(AsyncHTTPTestCase):
 
-    ARGV = []
-    SERVICE = MyService
+    @pytest.fixture(autouse=True)
+    def set_commandline(self, monkeypatch):
+        monkeypatch.setattr(sys, 'argv', ['pytest'])
+
+    def get_app(self):
+        service = MyService()
+        service.initialize_logging()
+        return service.get_app()
 
     def test_simple_get(self):
         response = self.fetch('/test', headers={'Accept':

test/test_stats.py

@@ -24,7 +24,6 @@
 from schematics.types import StringType
 
 from tornado import gen
-from tornado.ioloop import IOLoop
 from tornado.testing import AsyncHTTPTestCase
 
 import supercell.api as s
@@ -67,9 +66,6 @@ def do_something(self):
 
 class TestSupercellStats(AsyncHTTPTestCase):
 
-    def get_new_ioloop(self):
-        return IOLoop.instance()
-
     def get_app(self):
         env = Environment()
         env.add_handler('/teststats', MyHandler)