Overriding settings done the right way.

Author: jorenham

tests/test_mailing.py

@@ -175,12 +175,6 @@ def setUp(self):
         self.sub = Submission.from_message(self.m)
         self.sub.save()
 
-    def tearDown(self):
-        # Restore delay settings
-        settings.NEWSLETTER_EMAIL_DELAY = 0
-        settings.NEWSLETTER_BATCH_DELAY = 0
-        settings.NEWSLETTER_BATCH_SIZE = 0
-
     def test_submission(self):
         """ Assure initial Submission is in expected state. """
 
@@ -234,29 +228,26 @@ def test_submitsubmission(self):
     def test_delayedsumbmission(self):
         """ Test delays between emails """
 
-        settings.NEWSLETTER_EMAIL_DELAY = 0.01
-        
         self.sub.prepared = True
         self.sub.publish_date = now() - timedelta(seconds=1)
         self.sub.save()
 
-        with unittest.mock.patch('time.sleep', return_value=None) as mock:
-            Submission.submit_queue()
+        with self.settings(NEWSLETTER_EMAIL_DELAY=0.01):
+            with unittest.mock.patch('time.sleep', return_value=None) as mock:
+                Submission.submit_queue()
 
         mock.assert_called_with(0.01)
 
     def test_delayedbatchsumbmission(self):
         """ Test delays between emails """
 
-        settings.NEWSLETTER_BATCH_SIZE = 1
-        settings.NEWSLETTER_BATCH_DELAY = 0.02
-        
         self.sub.prepared = True
         self.sub.publish_date = now() - timedelta(seconds=1)
         self.sub.save()
 
-        with unittest.mock.patch('time.sleep', return_value=None) as mock:
-            Submission.submit_queue()
+        with self.settings(NEWSLETTER_BATCH_SIZE=1, NEWSLETTER_BATCH_DELAY=0.02):
+            with unittest.mock.patch('time.sleep', return_value=None) as mock:
+                Submission.submit_queue()
 
         mock.assert_called_with(0.02)