From f2d1c803783a4e69e84d46b5f87dd58b41cfc770 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Sun, 6 Apr 2014 14:21:40 +0100
Subject: [PATCH] Don't run tests with wagtailsearch signal handlers enabled

---
 wagtail/tests/urls.py                        |  4 ----
 wagtail/wagtailsearch/tests/test_backends.py | 10 +++++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/wagtail/tests/urls.py b/wagtail/tests/urls.py
index 83e12adfb..385d0e6cf 100644
--- a/wagtail/tests/urls.py
+++ b/wagtail/tests/urls.py
@@ -6,10 +6,6 @@ from wagtail.wagtaildocs import urls as wagtaildocs_urls
 from wagtail.wagtailsearch.urls import frontend as wagtailsearch_frontend_urls
 from wagtail.contrib.wagtailsitemaps.views import sitemap
 
-# Signal handlers
-from wagtail.wagtailsearch import register_signal_handlers as wagtailsearch_register_signal_handlers
-wagtailsearch_register_signal_handlers()
-
 
 urlpatterns = patterns('',
     url(r'^admin/', include(wagtailadmin_urls)),
diff --git a/wagtail/wagtailsearch/tests/test_backends.py b/wagtail/wagtailsearch/tests/test_backends.py
index 8fab1d152..86a67f21a 100644
--- a/wagtail/wagtailsearch/tests/test_backends.py
+++ b/wagtail/wagtailsearch/tests/test_backends.py
@@ -11,11 +11,6 @@ from wagtail.wagtailsearch.backends.db import DBSearch
 from wagtail.wagtailsearch.backends import InvalidSearchBackendError
 
 
-# Register wagtailsearch signal handlers
-from wagtail.wagtailsearch import register_signal_handlers
-register_signal_handlers()
-
-
 class BackendTests(object):
     # To test a specific backend, subclass BackendTests and define self.backend_path.
 
@@ -41,21 +36,25 @@ class BackendTests(object):
         testa = models.SearchTest()
         testa.title = "Hello World"
         testa.save()
+        self.backend.add(testa)
         self.testa = testa
 
         testb = models.SearchTest()
         testb.title = "Hello"
         testb.live = True
         testb.save()
+        self.backend.add(testb)
 
         testc = models.SearchTestChild()
         testc.title = "Hello"
         testc.live = True
         testc.save()
+        self.backend.add(testc)
 
         testd = models.SearchTestChild()
         testd.title = "World"
         testd.save()
+        self.backend.add(testd)
 
         # Refresh the index
         self.backend.refresh_index()
@@ -130,6 +129,7 @@ class BackendTests(object):
 
     def test_delete(self):
         # Delete one of the objects
+        self.backend.delete(self.testa)
         self.testa.delete()
 
         # Refresh index