diff --git a/src/milla/tests/test_app.py b/src/milla/tests/test_app.py index 15a72d0..1376e20 100644 --- a/src/milla/tests/test_app.py +++ b/src/milla/tests/test_app.py @@ -44,7 +44,7 @@ class ResponseMaker(object): for data in app_iter: self.body += data -def testing_environ(): +def environ_for_testing(): environ = {} wsgiref.util.setup_testing_defaults(environ) return environ @@ -61,7 +61,7 @@ def test_notfound(): ''' app = milla.app.Application(StubResolverUnresolved()) - environ = testing_environ() + environ = environ_for_testing() response = ResponseMaker() app_iter = app(environ, response.start_response) response.finish_response(app_iter) @@ -72,7 +72,7 @@ def test_favicon(): ''' app = milla.app.Application(StubResolverUnresolved()) - environ = testing_environ() + environ = environ_for_testing() environ.update({'PATH_INFO': '/favicon.ico'}) response = ResponseMaker() app_iter = app(environ, response.start_response) @@ -85,7 +85,7 @@ def test_allow_header_disallowed(): ''' app = milla.app.Application(StubResolver()) - environ = testing_environ() + environ = environ_for_testing() environ.update({'REQUEST_METHOD': 'POST'}) response = ResponseMaker() app_iter = app(environ, response.start_response) @@ -99,7 +99,7 @@ def test_allow_header_allowed(): resolver = StubResolver() resolver.controller.allowed_methods = ('POST',) app = milla.app.Application(resolver) - environ = testing_environ() + environ = environ_for_testing() environ.update({'REQUEST_METHOD': 'POST'}) response = ResponseMaker() app_iter = app(environ, response.start_response) @@ -113,7 +113,7 @@ def test_allow_header_options(): resolver = StubResolver() resolver.controller.allowed_methods = ('GET',) app = milla.app.Application(resolver) - environ = testing_environ() + environ = environ_for_testing() environ.update({'REQUEST_METHOD': 'OPTIONS'}) response = ResponseMaker() app_iter = app(environ, response.start_response) @@ -130,7 +130,7 @@ def test_emulated_method(): resolver = StubResolver() resolver.controller.allowed_methods = ('PUT',) app = milla.app.Application(resolver) - environ = testing_environ() + environ = environ_for_testing() environ.update({ 'REQUEST_METHOD': 'POST', 'CONTENT_TYPE': 'application/x-www-form-urlencoded', @@ -156,7 +156,7 @@ def test_function_before(): resolver = StubResolver() resolver.controller.__before__ = before app = milla.app.Application(resolver) - environ = testing_environ() + environ = environ_for_testing() response = ResponseMaker() app(environ, response.start_response) @@ -172,7 +172,7 @@ def test_instance_before(): return 'success' app = milla.app.Application(StubResolver(Controller())) - environ = testing_environ() + environ = environ_for_testing() response = ResponseMaker() app(environ, response.start_response) @@ -188,7 +188,7 @@ def test_instancemethod_before(): return 'success' app = milla.app.Application(StubResolver(Controller().foo)) - environ = testing_environ() + environ = environ_for_testing() response = ResponseMaker() app(environ, response.start_response) @@ -206,7 +206,7 @@ def test_partial_function_before(): resolver = StubResolver() resolver.controller = functools.partial(controller, text='success') app = milla.app.Application(resolver) - environ = testing_environ() + environ = environ_for_testing() response = ResponseMaker() app(environ, response.start_response) @@ -224,7 +224,7 @@ def test_partial_instance_before(): resolver = StubResolver() resolver.controller = functools.partial(Controller(), text='success') app = milla.app.Application(resolver) - environ = testing_environ() + environ = environ_for_testing() response = ResponseMaker() app(environ, response.start_response) @@ -245,7 +245,7 @@ def test_partial_instancemethod_before(): resolver = StubResolver() resolver.controller = functools.partial(Controller().foo, text='success') app = milla.app.Application(resolver) - environ = testing_environ() + environ = environ_for_testing() response = ResponseMaker() app(environ, response.start_response) @@ -260,7 +260,7 @@ def test_function_after(): resolver = StubResolver() resolver.controller.__after__ = after app = milla.app.Application(resolver) - environ = testing_environ() + environ = environ_for_testing() response = ResponseMaker() app(environ, response.start_response) @@ -276,7 +276,7 @@ def test_instance_after(): return 'success' app = milla.app.Application(StubResolver(Controller())) - environ = testing_environ() + environ = environ_for_testing() response = ResponseMaker() app(environ, response.start_response) @@ -292,7 +292,7 @@ def test_instancemethod_after(): return 'success' app = milla.app.Application(StubResolver(Controller().foo)) - environ = testing_environ() + environ = environ_for_testing() response = ResponseMaker() app(environ, response.start_response) @@ -310,7 +310,7 @@ def test_partial_function_after(): resolver = StubResolver() resolver.controller = functools.partial(controller, text='success') app = milla.app.Application(resolver) - environ = testing_environ() + environ = environ_for_testing() response = ResponseMaker() app(environ, response.start_response) @@ -328,7 +328,7 @@ def test_partial_instance_after(): resolver = StubResolver() resolver.controller = functools.partial(Controller(), text='success') app = milla.app.Application(resolver) - environ = testing_environ() + environ = environ_for_testing() response = ResponseMaker() app(environ, response.start_response) @@ -349,7 +349,7 @@ def test_partial_instancemethod_after(): resolver = StubResolver() resolver.controller = functools.partial(Controller().foo, text='success') app = milla.app.Application(resolver) - environ = testing_environ() + environ = environ_for_testing() response = ResponseMaker() app(environ, response.start_response) @@ -361,7 +361,7 @@ def test_httperror_response(): raise webob.exc.HTTPClientError() app = milla.app.Application(StubResolver(controller)) - environ = testing_environ() + environ = environ_for_testing() response = ResponseMaker() app_iter = app(environ, response.start_response) response.finish_response(app_iter) @@ -386,7 +386,7 @@ def test_single_start_response(): return 'test' app = milla.app.Application(StubResolver(controller)) - environ = testing_environ() + environ = environ_for_testing() response = ResponseMaker() start_response = TestStartResponse(response.start_response) app_iter = app(environ, start_response)