Django 1.7, working version.

[wolnelektury.git] / apps / opds / tests / __init__.py

diff --git a/apps/opds/tests/__init__.py b/apps/opds/tests/__init__.py
index 8d51b7b..b1399ae 100755 (executable)
--- a/apps/opds/tests/__init__.py
+++ b/apps/opds/tests/__init__.py
@@ -2,18 +2,22 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
+from unittest import skipIf
 from lxml import etree
+from django.conf import settings
 from django.core.files.base import ContentFile
 import catalogue
 from catalogue.test_utils import (BookInfoStub, PersonStub, info_args,
         WLTestCase, get_fixture)
 from catalogue.models import Book
 from librarian import WLURI, XMLNamespace
-from search import Index, Search
+from search.index import Index, Search
 
 AtomNS = XMLNamespace("http://www.w3.org/2005/Atom")
 
 
+@skipIf(getattr(settings, 'NO_SEARCH_INDEX', False),
+    u'Requires search server and NO_SEARCH_INDEX=False.')
 class OpdsSearchTests(WLTestCase):
     """Tests search feed in OPDS.."""
     def setUp(self):
@@ -22,11 +26,10 @@ class OpdsSearchTests(WLTestCase):
         index.index.delete_all()
         index.index.commit()
 
-        with self.settings(NO_SEARCH_INDEX=False):
-            self.do_doktora = Book.from_xml_file(
-                get_fixture('do-doktora.xml'))
-            self.do_anusie = Book.from_xml_file(
-                get_fixture('fraszka-do-anusie.xml', catalogue))
+        self.do_doktora = Book.from_xml_file(
+            get_fixture('do-doktora.xml'))
+        self.do_anusie = Book.from_xml_file(
+            get_fixture('fraszka-do-anusie.xml', catalogue))
 
     def assert_finds(self, query, books):
         """Takes a query and tests against books expected to be found."""