Removed search engine from constant in Indexer

The search engine was being passed as a constant to
the Mail Indexer, that constrained the user agent to
one user (because the search engine is user specific).

I added the search engine as a parameter on the Mail Indexer
initialization so that we can have the Indexer working for
each user.

1 files changed, 5 insertions, 7 deletions

diff --git a/service/test/unit/adapter/test_mailbox_indexer_listener.py b/service/test/unit/adapter/test_mailbox_indexer_listener.py
index 9ad3c94d..9d5f4c30 100644
--- a/service/test/unit/adapter/test_mailbox_indexer_listener.py
+++ b/service/test/unit/adapter/test_mailbox_indexer_listener.py
@@ -35,19 +35,17 @@ class MailboxListenerTest(unittest.TestCase):
         mailbox.listeners = set()
         when(mailbox).addListener = lambda x: mailbox.listeners.add(x)
 
-        self.assertNotIn(MailboxIndexerListener('INBOX', self.mail_store), mailbox.listeners)
+        self.assertNotIn(MailboxIndexerListener('INBOX', self.mail_store, mock()), mailbox.listeners)
 
-        MailboxIndexerListener.listen(self.account, 'INBOX', self.mail_store)
+        MailboxIndexerListener.listen(self.account, 'INBOX', self.mail_store, mock())
 
-        self.assertIn(MailboxIndexerListener('INBOX', self.mail_store), mailbox.listeners)
+        self.assertIn(MailboxIndexerListener('INBOX', self.mail_store, mock()), mailbox.listeners)
 
     def test_reindex_missing_idents(self):
         search_engine = mock()
         when(search_engine).search('tag:inbox', all_mails=True).thenReturn(['ident1', 'ident2'])
 
-        MailboxIndexerListener.SEARCH_ENGINE = search_engine
-
-        listener = MailboxIndexerListener('INBOX', self.mail_store)
+        listener = MailboxIndexerListener('INBOX', self.mail_store, search_engine)
         when(self.mail_store).get_mailbox_mail_ids('INBOX').thenReturn({'ident1', 'ident2', 'missing_ident'})
         self.mail_store.used_arguments = []
         self.mail_store.get_mails = lambda x: self.mail_store.used_arguments.append(x)
@@ -59,7 +57,7 @@ class MailboxListenerTest(unittest.TestCase):
     @defer.inlineCallbacks
     def test_catches_exceptions_to_not_break_other_listeners(self):
         when(logger).error(ANY()).thenReturn(None)
-        listener = MailboxIndexerListener('INBOX', self.mail_store)
+        listener = MailboxIndexerListener('INBOX', self.mail_store, mock())
 
         yield listener.newMessages(1, 1)