From 08497951fa9aed8d28be8b2dea1aef2135f56769 Mon Sep 17 00:00:00 2001 From: Folker Bernitt Date: Thu, 6 Aug 2015 13:25:30 +0200 Subject: Made LeapMail compatible with SearchEngine. --- service/test/support/integration/app_test_client.py | 5 +++-- service/test/support/integration/soledad_test_base.py | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'service/test/support/integration') diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py index c5e419b1..28d378b3 100644 --- a/service/test/support/integration/app_test_client.py +++ b/service/test/support/integration/app_test_client.py @@ -32,6 +32,7 @@ from twisted.internet.defer import succeed from twisted.web.resource import getChildForRequest from twisted.web.server import Site from pixelated.adapter.mailstore import LeapMailStore +from pixelated.adapter.mailstore.searchable_mailstore import SearchableMailStore from pixelated.adapter.model.mail import PixelatedMail from pixelated.adapter.search import SearchEngine @@ -65,14 +66,14 @@ class AppTestClient(object): self.soledad = yield initialize_soledad(tempdir=soledad_test_folder) - self.mail_store = LeapMailStore(self.soledad) - self.soledad_querier = self._create_soledad_querier(self.soledad, self.INDEX_KEY) self.keymanager = mock() self.search_engine = SearchEngine(self.INDEX_KEY, agent_home=soledad_test_folder) self.mail_sender = self._create_mail_sender() + self.mail_store = SearchableMailStore(LeapMailStore(self.soledad), self.search_engine) + account_ready_cb = defer.Deferred() self.account = IMAPAccount(self.ACCOUNT, self.soledad, account_ready_cb) yield account_ready_cb diff --git a/service/test/support/integration/soledad_test_base.py b/service/test/support/integration/soledad_test_base.py index 1a2645d1..e3e582d2 100644 --- a/service/test/support/integration/soledad_test_base.py +++ b/service/test/support/integration/soledad_test_base.py @@ -35,7 +35,6 @@ class SoledadTestBase(unittest.TestCase, AppTestClient): self.adaptor = SoledadMailAdaptor() self.mbox_uuid = str(uuid4()) yield self.start_client() - self.store = LeapMailStore(self.soledad) def tearDown(self): set_events_enabled(True) -- cgit v1.2.3