diff options
| author | Duda Dornelles <ddornell@thoughtworks.com> | 2014-10-10 14:14:42 +0200 |
|---|---|---|
| committer | Duda Dornelles <ddornell@thoughtworks.com> | 2014-10-10 14:14:46 +0200 |
| commit | 622631a2007c60a4bf34ca1ce0713b339180e435 (patch) | |
| tree | 2ca525a69e3dc020d9e966975a20805acfabb0fd /service/test | |
| parent | 6b2bf282db6d889e633af6b8771d2393c335131d (diff) | |
Using file index for whoosh and fixing functional tests
Diffstat (limited to 'service/test')
| -rw-r--r-- | service/test/functional/features/steps/data_setup.py | 4 | ||||
| -rw-r--r-- | service/test/support/integration_helper.py | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/service/test/functional/features/steps/data_setup.py b/service/test/functional/features/steps/data_setup.py index 2d250c92..4f70a8db 100644 --- a/service/test/functional/features/steps/data_setup.py +++ b/service/test/functional/features/steps/data_setup.py @@ -19,5 +19,5 @@ from test.support.integration_helper import MailBuilder @given('I have a mail in my inbox') def add_mail_impl(context): - mail = MailBuilder().build_input_mail() - context.mailboxes.inbox().add(mail) + input_mail = MailBuilder().build_input_mail() + context.soledad_test_base.add_mail_to_inbox(input_mail) diff --git a/service/test/support/integration_helper.py b/service/test/support/integration_helper.py index e776e3c3..fdc507ea 100644 --- a/service/test/support/integration_helper.py +++ b/service/test/support/integration_helper.py @@ -112,6 +112,10 @@ class SoledadTestBase: def setup_soledad(self): unstub() # making sure all mocks from other tests are reset + # making sure soledad test folder is not there + if (os.path.isdir(soledad_test_folder)): + os.rmdir(soledad_test_folder) + self.soledad = initialize_soledad(tempdir=soledad_test_folder) self.mail_address = "test@pixelated.org" @@ -129,7 +133,10 @@ class SoledadTestBase: self.tag_service = TagService(self.tag_index) self.draft_service = DraftService(self.pixelated_mailboxes) self.mail_service = MailService(self.pixelated_mailboxes, self.mail_sender, self.tag_service) + + SearchEngine.INDEX_FOLDER = soledad_test_folder + '/search_index' self.search_engine = SearchEngine() + self.search_engine.index_mails(self.mail_service.all_mails()) pixelated.user_agent.mail_service = self.mail_service |