Nix tower-related hacks

We no longer need to set SETTINGS_MODULE in override_settings now that we have an up-to-date tower with the fix.
mythmon · Oct 2, 2012 · 48261cc · 48261cc
1 parent a327733
commit 48261cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/fjord/base/tests/__init__.py b/fjord/base/tests/__init__.py
@@ -41,8 +41,7 @@ def request(self, **request):
         return super(LocalizingClient, self).request(**request)
 
 
-# Include `SETTINGS_MODULE` so that tower doesn't get confused and die.
-@override_settings(ES_LIVE_INDEX=False, SETTINGS_MODULE='fjord.settings')
+@override_settings(ES_LIVE_INDEX=False)
 class TestCase(OriginalTestCase):
     """A modification of ``test_utils.TestCase`` that skips live indexing."""
     pass

diff --git a/fjord/base/tests/test_views.py b/fjord/base/tests/test_views.py
@@ -20,8 +20,6 @@ def test_monitor_view(self):
         test_memcached = views.test_memcached
         try:
             with self.settings(
-                # Note: tower dies if we don't set SETTINGS_MODULE.
-                SETTINGS_MODULE='fjord.settings',
                 CACHES={
                     'default': {
                         'BACKEND': 'caching.backends.memcached.CacheClass',
@@ -62,7 +60,7 @@ def test_404(self):
         eq_(request.status_code, 404)
         self.assertTemplateUsed(request, '404.html')
 
-    @override_settings(SHOW_STAGE_NOTICE=True, SETTINGS_MODULE='fjord.settings')
+    @override_settings(SHOW_STAGE_NOTICE=True)
     def test_500(self):
         with self.assertRaises(IntentionalException) as cm:
             self.client.get('/services/throw-error')