diff options
| author | Victor Shyba <victor.shyba@gmail.com> | 2015-07-17 16:44:47 +0200 |
|---|---|---|
| committer | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-08-11 17:00:24 +0200 |
| commit | 9712b180af268731595a504f2b4e9fdcc0584215 (patch) | |
| tree | 9e8247ee0b9b6c4ae81262a7c36a9f5842fcb746 /service/test/support | |
| parent | cf445be6de641fef29b3279cdb3783e33748b489 (diff) | |
fix test_soledad_querier
Diffstat (limited to 'service/test/support')
| -rw-r--r-- | service/test/support/integration/app_test_client.py | 9 | ||||
| -rw-r--r-- | service/test/support/integration/soledad_test_base.py | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py index 80b399ed..e5c845cc 100644 --- a/service/test/support/integration/app_test_client.py +++ b/service/test/support/integration/app_test_client.py @@ -23,7 +23,7 @@ import uuid from leap.mail.imap.account import IMAPAccount from leap.soledad.client import Soledad -from mock import MagicMock, Mock +from mock import Mock from twisted.internet import reactor, defer from twisted.internet.defer import succeed from twisted.web.resource import getChildForRequest @@ -66,12 +66,15 @@ class AppTestClient(object): self.search_engine = SearchEngine(self.INDEX_KEY, agent_home=soledad_test_folder) self.mail_sender = self._create_mail_sender() - self.account = IMAPAccount(self.ACCOUNT, self.soledad, MagicMock()) + account_ready_cb = defer.Deferred() + self.account = IMAPAccount(self.ACCOUNT, self.soledad, account_ready_cb) + yield account_ready_cb self.mailboxes = Mailboxes(self.account, self.soledad_querier, self.search_engine) self.draft_service = DraftService(self.mailboxes) self.mail_service = self._create_mail_service(self.mailboxes, self.mail_sender, self.soledad_querier, self.search_engine) - self.search_engine.index_mails((yield self.mail_service.all_mails())) + mails = yield self.mail_service.all_mails() + self.search_engine.index_mails(mails) self.resource = RootResource() self.resource.initialize(self.keymanager, self.search_engine, self.mail_service, self.draft_service) diff --git a/service/test/support/integration/soledad_test_base.py b/service/test/support/integration/soledad_test_base.py index c49de00a..979b1f96 100644 --- a/service/test/support/integration/soledad_test_base.py +++ b/service/test/support/integration/soledad_test_base.py @@ -23,7 +23,7 @@ class SoledadTestBase(unittest.TestCase, AppTestClient): DEFERRED_TIMEOUT_LONG = 300 def setUp(self): - self.start_client() + return self.start_client() def tearDown(self): self.cleanup() |