Merge pull request #2989 from getsentry/aliases

Apply mail.backend aliases before escalating into settings

Author: mattrobenolt

src/sentry/runner/initializer.py

@@ -140,6 +140,12 @@ def bootstrap_options(settings, config=None):
     for o in (settings.SENTRY_DEFAULT_OPTIONS, settings.SENTRY_OPTIONS):
         for k, v in o.iteritems():
             if k in options_mapper:
+                # Map the mail.backend aliases to something Django understands
+                if k == 'mail.backend':
+                    try:
+                        v = settings.SENTRY_EMAIL_BACKEND_ALIASES[v]
+                    except KeyError:
+                        pass
                 # Escalate the few needed to actually get the app bootstrapped into settings
                 setattr(settings, options_mapper[k], v)
 

tests/sentry/runner/test_initializer.py

@@ -16,6 +16,7 @@ class Settings(object):
     s.SENTRY_FEATURES = {}
     s.SENTRY_OPTIONS = {}
     s.SENTRY_DEFAULT_OPTIONS = {}
+    s.SENTRY_EMAIL_BACKEND_ALIASES = {'dummy': 'alias-for-dummy'}
     return s
 
 
@@ -138,6 +139,14 @@ def test_bootstrap_options_no_config_only_sentry_options(settings):
     assert settings.EMAIL_SUBJECT_PREFIX == 'my-mail-subject-prefix'
 
 
+def test_bootstrap_options_mail_aliases(settings):
+    settings.SENTRY_OPTIONS = {
+        'mail.backend': 'dummy',
+    }
+    bootstrap_options(settings)
+    assert settings.EMAIL_BACKEND == 'alias-for-dummy'
+
+
 def test_bootstrap_options_missing_file(settings):
     bootstrap_options(settings, 'this-file-does-not-exist-xxxxxxxxxxxxxx.yml')
     assert settings.SENTRY_OPTIONS == {}