Fix settings and update tests

tests/test_views.py

@@ -268,9 +268,6 @@ def test_response_version_header(self):
         self.assertTrue(response.has_header('X-Watchman-Version'))
 
 
-# TODO: Figure out why settings defaults aren't working - related to https://github.com/mwarkentin/django-watchman/issues/13?
-@override_settings(WATCHMAN_EMAIL_RECIPIENTS=['to@example.com'])
-@override_settings(WATCHMAN_EMAIL_HEADERS={})
 class TestEmailCheck(DjangoTestCase):
     def setUp(self):
         # Ensure that every test executes with separate settings
@@ -288,6 +285,9 @@ def def_test_email_with_default_recipient(self):
 
     @override_settings(WATCHMAN_EMAIL_RECIPIENTS=['custom@example.com'])
     def def_test_email_with_custom_recipient(self):
+        # Have to manually reload settings here because override_settings
+        # happens after self.setUp()
+        reload_settings()
         checks._check_email()
 
         # Test that one message has been sent.
@@ -299,6 +299,9 @@ def def_test_email_with_custom_recipient(self):
 
     @override_settings(WATCHMAN_EMAIL_RECIPIENTS=['to1@example.com', 'to2@example.com'])
     def def_test_email_with_multiple_recipients(self):
+        # Have to manually reload settings here because override_settings
+        # happens after self.setUp()
+        reload_settings()
         checks._check_email()
 
         # Test that one message has been sent.
@@ -322,6 +325,9 @@ def test_email_check_with_default_headers(self):
 
     @override_settings(WATCHMAN_EMAIL_HEADERS={'foo': 'bar'})
     def test_email_check_with_custom_headers(self):
+        # Have to manually reload settings here because override_settings
+        # happens after self.setUp()
+        reload_settings()
         checks._check_email()
 
         # Test that one message has been sent.

watchman/checks.py

@@ -10,6 +10,7 @@
 from django.db import connections
 
 from watchman.decorators import check
+from watchman import settings as watchman_settings
 from watchman import utils
 
 
@@ -43,12 +44,12 @@ def _check_database(database):
 @check
 def _check_email():
     headers = {"X-DJANGO-WATCHMAN": True}
-    headers.update(settings.WATCHMAN_EMAIL_HEADERS)
+    headers.update(watchman_settings.WATCHMAN_EMAIL_HEADERS)
     email = EmailMessage(
         "django-watchman email check",
         "This is an automated test of the email system.",
         "watchman@example.com",
-        settings.WATCHMAN_EMAIL_RECIPIENTS,
+        watchman_settings.WATCHMAN_EMAIL_RECIPIENTS,
         headers=headers,
     )
     email.send()