Permalink
Browse files

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.
  • Loading branch information...
willkg committed Oct 2, 2012
1 parent a327733 commit 48261ccc4743ec465b85056bdbe8b2b74a83c213
Showing with 2 additions and 5 deletions.
  1. +1 −2 fjord/base/tests/__init__.py
  2. +1 −3 fjord/base/tests/test_views.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
@@ -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')

0 comments on commit 48261cc

Please sign in to comment.