fixup

Author: albu-diku

mig/wsgi-bin/migwsgi.py

@@ -83,6 +83,7 @@ def stub(configuration, client_id, user_arguments_dict, environ, _retrieve_handl
     #            NEVER print/output it verbatim before it is validated below.
 
     try:
+        default_page = configuration.site_landing_page # TODO: avoid doing this work a second time
         backend = requested_backend(environ, fallback=default_page)
         valid_backend_name(backend)
     except InputException as iex:
@@ -210,9 +211,9 @@ def application(environ, start_response):
     def _set_os_environ(value):
         os.environ = value
 
-    return _application(environ, start_response, _format_output=format_output, _set_environ=_set_os_environ, _wrap_wsgi_errors=wrap_wsgi_errors)
+    return _application(environ, start_response, _set_environ=_set_os_environ, _wrap_wsgi_errors=wrap_wsgi_errors)
 
-def _application(environ, start_response, _format_output, _set_environ, _retrieve_handler=_import_backend, _wrap_wsgi_errors=True, _config_file=None, _skip_log=False):
+def _application(environ, start_response, _set_environ, _retrieve_handler=_import_backend, _wrap_wsgi_errors=True, _config_file=None, _skip_log=False):
 
     # NOTE: pass app environ including apache and query args on to sub handlers
     #       through the usual 'os.environ' channel expected in functionality

tests/test_mig_wsgi-bin_migwsgi.py

@@ -33,7 +33,7 @@
 import sys
 
 from tests.support import MIG_BASE, MigTestCase, testmain
-
+import mig.shared.returnvalues as returnvalues
 
 def create_output_returner(arranged=None):
     def test_format_output(*args):
@@ -108,7 +108,7 @@ def test_xxx(self):
         config_global_values = _assert_local_config_global_values(config)
 
         def fake_handler(*args):
-            pass
+            return [], returnvalues.OK
 
         def fake_start_response(status, headers, exc=None):
             fake_start_response.calls.append((status, headers, exc))
@@ -127,7 +127,6 @@ def fake_set_environ(value):
         test_output_returner = create_output_returner('HELLO WORLD')
 
         yielder = migwsgi._application(wsgi_environ, fake_start_response,
-            _format_output=test_output_returner,
             _set_environ=fake_set_environ,
             _retrieve_handler=lambda _: fake_handler,
             _wrap_wsgi_errors=noop,