test settings fix

diff --git a/apps/catalogue/test_utils.py b/apps/catalogue/test_utils.py
index eeda03f..b3e2bc2 100644 (file)
--- a/apps/catalogue/test_utils.py
+++ b/apps/catalogue/test_utils.py
@@ -11,14 +11,18 @@ class WLTestCase(TestCase):
     """
     def setUp(self):
         self._MEDIA_ROOT, settings.MEDIA_ROOT = settings.MEDIA_ROOT, tempfile.mkdtemp(prefix='djangotest_')
     """
     def setUp(self):
         self._MEDIA_ROOT, settings.MEDIA_ROOT = settings.MEDIA_ROOT, tempfile.mkdtemp(prefix='djangotest_')

-        settings.NO_BUILD_PDF = settings.NO_BUILD_MOBI = settings.NO_BUILD_EPUB = settings.NO_BUILD_TXT = True
+        settings.NO_SEARCH_INDEX = settings.NO_BUILD_PDF = settings.NO_BUILD_MOBI = settings.NO_BUILD_EPUB = settings.NO_BUILD_TXT = True

         settings.CELERY_ALWAYS_EAGER = True
         settings.CELERY_ALWAYS_EAGER = True

-        self._CACHE_BACKEND, settings.CACHE_BACKEND = settings.CACHE_BACKEND, 'dummy://'
+        self._CACHES, settings.CACHES = settings.CACHES, {
+            'default': {
+                'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
+            }
+        }

 
     def tearDown(self):
         shutil.rmtree(settings.MEDIA_ROOT, True)
         settings.MEDIA_ROOT = self._MEDIA_ROOT
 
     def tearDown(self):
         shutil.rmtree(settings.MEDIA_ROOT, True)
         settings.MEDIA_ROOT = self._MEDIA_ROOT

-        settings.CACHE_BACKEND = self._CACHE_BACKEND
+        settings.CACHES = self._CACHES

 
 class PersonStub(object):
 
 
 class PersonStub(object):
 

diff --git a/apps/search/tests/index.py b/apps/search/tests/index.py
index ee376a8..ef253e4 100644 (file)
--- a/apps/search/tests/index.py
+++ b/apps/search/tests/index.py
@@ -15,6 +15,7 @@ class BookSearchTests(WLTestCase):
     def setUp(self):
         JVM.attachCurrentThread()
         WLTestCase.setUp(self)
     def setUp(self):
         JVM.attachCurrentThread()
         WLTestCase.setUp(self)

+        settings.NO_SEARCH_INDEX = False

         settings.SEARCH_INDEX = path.join(settings.MEDIA_ROOT, 'search')
 
         txt = path.join(path.dirname(__file__), 'files/fraszka-do-anusie.xml')
         settings.SEARCH_INDEX = path.join(settings.MEDIA_ROOT, 'search')
 
         txt = path.join(path.dirname(__file__), 'files/fraszka-do-anusie.xml')