diff options
| author | Bruno Wagner <bwagner@riseup.net> | 2015-09-10 15:51:14 -0300 |
|---|---|---|
| committer | Bruno Wagner <bwagner@riseup.net> | 2015-09-10 15:51:14 -0300 |
| commit | 8d2dac75d667818ea28abc0c25f45e4ce4b3f6c8 (patch) | |
| tree | d36d21cf6a09997dd8f9e54c795afc91a76872fb /service/test/support | |
| parent | 6f708c2b53c8faa2bc3d73891413a44d33044237 (diff) | |
Removed PixelatedMail class leftovers
We removed Pixelated mail tests and adapted the remaining tests to use
Leap mail instead of it. Completely removed that now
Diffstat (limited to 'service/test/support')
| -rw-r--r-- | service/test/support/integration/app_test_client.py | 3 | ||||
| -rw-r--r-- | service/test/support/test_helper.py | 8 |
2 files changed, 1 insertions, 10 deletions
diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py index 0b3e71a2..3245e728 100644 --- a/service/test/support/integration/app_test_client.py +++ b/service/test/support/integration/app_test_client.py @@ -36,7 +36,6 @@ from pixelated.config.site import PixelatedSite 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 from pixelated.adapter.services.draft_service import DraftService from pixelated.adapter.services.mail_service import MailService @@ -62,8 +61,6 @@ class AppTestClient(object): self.cleanup = lambda: shutil.rmtree(soledad_test_folder) - PixelatedMail.from_email_address = self.MAIL_ADDRESS - self.soledad = yield initialize_soledad(tempdir=soledad_test_folder) self.keymanager = mock() diff --git a/service/test/support/test_helper.py b/service/test/support/test_helper.py index 8f2a5308..21f59d8f 100644 --- a/service/test/support/test_helper.py +++ b/service/test/support/test_helper.py @@ -17,7 +17,7 @@ from datetime import datetime import io from twisted.web.test.test_web import DummyRequest -from pixelated.adapter.model.mail import InputMail, PixelatedMail +from pixelated.adapter.model.mail import InputMail LEAP_FLAGS = ['\\Seen', @@ -69,12 +69,6 @@ def leap_mail(uid=0, flags=LEAP_FLAGS, headers=None, extra_headers={}, mbox_uuid return (fdoc, hdoc, bdoc) -def pixelated_mail(uid=0, flags=LEAP_FLAGS, headers=None, extra_headers={}, mbox_uuid='INBOX', body='body', chash='chash'): - fdoc, hdoc, bdoc = leap_mail(uid, flags, headers, extra_headers, mbox_uuid, body, chash) - - return PixelatedMail.from_soledad(fdoc, hdoc, bdoc) - - def input_mail(): mail = InputMail() mail.fdoc = TestDoc({}) |