simplify

Author: albu-diku

mig/wsgi-bin/migwsgi.py

@@ -213,9 +213,10 @@ def application(environ, start_response):
     def _set_os_environ(value):
         os.environ = value
 
-    return _application(environ, start_response, _set_environ=_set_os_environ, _wrap_wsgi_errors=wrap_wsgi_errors)
+    return _application(None, environ, start_response, _set_environ=_set_os_environ, _wrap_wsgi_errors=wrap_wsgi_errors)
 
-def _application(environ, start_response, _set_environ, _format_output=format_output, _retrieve_handler=_import_backend, _wrap_wsgi_errors=True, _config_file=None, _skip_log=False):
+
+def _application(configuration, environ, start_response, _set_environ, _format_output=format_output, _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
@@ -266,7 +267,9 @@ def _application(environ, start_response, _set_environ, _format_output=format_ou
     if sys.version_info[0] < 3:
         sys.stdout = sys.stderr
 
-    configuration = get_configuration_object(_config_file, _skip_log)
+    if configuration is None:
+        configuration = get_configuration_object(_config_file, _skip_log)
+
     _logger = configuration.logger
 
     # NOTE: replace default wsgi errors to apache error log with our own logs

tests/support/wsgisupp.py

@@ -28,10 +28,10 @@
 """Test support library for WSGI."""
 
 
-def create_wsgi_environ(config_file, wsgi_variables):
+def create_wsgi_environ(configuration, wsgi_variables):
     environ = {}
     environ['wsgi.input'] = ()
-    environ['MIG_CONF'] = config_file
+    environ['MIG_CONF'] = configuration.config_file
     environ['HTTP_HOST'] = wsgi_variables.get('http_host')
     environ['PATH_INFO'] = wsgi_variables.get('path_info')
     environ['SCRIPT_URI'] = ''.join(('http://', environ['HTTP_HOST'], environ['PATH_INFO']))

tests/test_mig_wsgi-bin_migwsgi.py

@@ -61,29 +61,12 @@ def _import_migwsgi():
 migwsgi = _import_migwsgi()
 
 
-def _assert_local_config():
-    try:
-        link_stat = os.lstat(_TEST_CONF_SYMLINK)
-        assert stat.S_ISLNK(link_stat.st_mode)
-        configdir_stat = os.stat(_TEST_CONF_DIR)
-        assert stat.S_ISDIR(configdir_stat.st_mode)
-        config = ConfigParser()
-        config.read([_TEST_CONF_FILE])
-        return config
-    except Exception as exc:
-        raise AssertionError('local configuration invalid or missing: %s' % (str(exc),))
-
-
-def _assert_local_config_global_values(config):
-    config_global_values = dict(config.items('GLOBAL'))
-
-    for path in ('mig_path', 'certs_path', 'state_path'):
-        path_value = config_global_values.get(path)
+def _assert_local_config_global_values(configuration):
+    for config_key in ('mig_path', 'certs_path', 'state_path'):
+        path_value = getattr(configuration, config_key)
         if not is_path_within(path_value, start=_LOCAL_MIG_BASE):
             raise AssertionError('local config contains bad path: %s=%s' % (path, path_value))
 
-    return config_global_values
-
 
 def _is_return_value(return_value):
     defined_return_values = returnvalues.__dict__.values()
@@ -197,12 +180,14 @@ def was_called(fake):
         self.assertTrue(was_called(self.instrumented_format_output), "no output generated")
         self.assertTrue(was_called(self.instrumented_retrieve_handler), "no output generated")
 
+    def _provide_configuration(self):
+        return 'testconfig'
+
     def before_each(self):
-        config = _assert_local_config()
-        config_global_values = _assert_local_config_global_values(config)
+        _assert_local_config_global_values(self.configuration)
 
         # generic WSGI setup
-        self.fake_wsgi_environ = create_wsgi_environ(_TEST_CONF_FILE, wsgi_variables=dict(
+        self.fake_wsgi_environ = create_wsgi_environ(self.configuration, wsgi_variables=dict(
             http_host='localhost',
             path_info='/',
         ))
@@ -212,11 +197,9 @@ def before_each(self):
         self.instrumented_format_output = create_instrumented_format_output()
         self.instrumented_retrieve_handler = create_instrumented_retrieve_handler()
 
-        self.application_args = (self.fake_wsgi_environ, self.fake_start_response,)
+        self.application_args = (self.configuration, self.fake_wsgi_environ, self.fake_start_response,)
         self.application_kwargs = dict(
             _wrap_wsgi_errors=noop,
-            _config_file=_TEST_CONF_FILE,
-            _skip_log=True,
             _format_output=self.instrumented_format_output,
             _retrieve_handler=self.instrumented_retrieve_handler,
             _set_environ=noop,