Merge branch 'master' into rwd

[wolnelektury.git] / apps / catalogue / test_utils.py

diff --git a/apps/catalogue/test_utils.py b/apps/catalogue/test_utils.py
index 59e5138..dd11e93 100644 (file)
--- a/apps/catalogue/test_utils.py
+++ b/apps/catalogue/test_utils.py
@@ -2,15 +2,19 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
+from os.path import abspath, dirname, join
+import tempfile
+from traceback import extract_stack
 from django.test import TestCase
 from django.test.utils import override_settings
-import tempfile
-from slughifi import slughifi
+from fnpdjango.utils.text.slughifi import slughifi
 from librarian import WLURI
+from django.conf import settings
+
 
 @override_settings(
     MEDIA_ROOT=tempfile.mkdtemp(prefix='djangotest_'),
-    CATALOGUE_DONT_BUILD={'pdf', 'mobi', 'epub', 'txt', 'fb2', 'cover'},
+    CATALOGUE_DONT_BUILD=set(['pdf', 'mobi', 'epub', 'txt', 'fb2', 'cover']),
     NO_SEARCH_INDEX = True,
     CELERY_ALWAYS_EAGER = True,
     CACHES={
@@ -18,6 +22,7 @@ from librarian import WLURI
             'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'},
             'permanent': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'},
         },
+    SOLR = settings.SOLR_TEST,
 )
 class WLTestCase(TestCase):
     """
@@ -77,3 +82,13 @@ def info_args(title, language=None):
         'about': u"http://wolnelektury.pl/example/URI/%s" % slug,
         'language': language,
     }
+
+
+def get_fixture(path, app=None):
+    if app is not None:
+        mod_path = app.__file__
+        f_path = join(dirname(abspath(mod_path)), 'tests/files', path)
+    else:
+        mod_path = extract_stack(limit=2)[0][0]
+        f_path = join(dirname(abspath(mod_path)), 'files', path)
+    return f_path