summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-08-24 13:45:40 -0400
committerKali Kaneko <kali@leap.se>2016-08-25 11:13:22 -0400
commit8c49f1e16e8743acf994ec96aaf005275e8f54d5 (patch)
tree563a1b290abe2dab2186a6c478f6e41b363686df
parent67ba7029ed3c2a68baef850dc1ff5ba23fc926cd (diff)
[tests] move sample file to incoming test folder
-rw-r--r--mail/src/leap/mail/incoming/tests/rfc822.multi-encrypt-signed.message (renamed from mail/src/leap/mail/testing/rfc822.multi-encrypt-signed.message)0
-rw-r--r--mail/src/leap/mail/incoming/tests/test_incoming_mail.py8
2 files changed, 3 insertions, 5 deletions
diff --git a/mail/src/leap/mail/testing/rfc822.multi-encrypt-signed.message b/mail/src/leap/mail/incoming/tests/rfc822.multi-encrypt-signed.message
index 98304f24..98304f24 100644
--- a/mail/src/leap/mail/testing/rfc822.multi-encrypt-signed.message
+++ b/mail/src/leap/mail/incoming/tests/rfc822.multi-encrypt-signed.message
diff --git a/mail/src/leap/mail/incoming/tests/test_incoming_mail.py b/mail/src/leap/mail/incoming/tests/test_incoming_mail.py
index 8b598f24..09a7e1e1 100644
--- a/mail/src/leap/mail/incoming/tests/test_incoming_mail.py
+++ b/mail/src/leap/mail/incoming/tests/test_incoming_mail.py
@@ -39,16 +39,13 @@ from leap.keymanager.errors import KeyAddressMismatch
from leap.mail.adaptors import soledad_indexes as fields
from leap.mail.adaptors.soledad import cleanup_deferred_locks
from leap.mail.adaptors.soledad import SoledadMailAdaptor
-from leap.mail.constants import INBOX_NAME
from leap.mail.mail import MessageCollection
from leap.mail.mailbox_indexer import MailboxIndexer
-from leap.mail.imap.account import IMAPAccount
from leap.mail.incoming.service import IncomingMail
from leap.mail.rfc3156 import MultipartEncrypted, PGPEncrypted
from leap.mail.testing import KeyManagerWithSoledadTestCase
from leap.mail.testing import ADDRESS, ADDRESS_2
-from leap.mail import testing
from leap.soledad.common.document import SoledadDocument
from leap.soledad.common.crypto import (
EncryptionSchemes,
@@ -56,6 +53,8 @@ from leap.soledad.common.crypto import (
ENC_SCHEME_KEY,
)
+HERE = os.path.split(os.path.abspath(__file__))[0]
+
# TODO: add some tests for encrypted, unencrypted, signed and unsgined messages
@@ -330,9 +329,8 @@ subject: independence of cyberspace
return d
def testValidateSignatureFromEncryptedEmailFromAppleMail(self):
- testing_path = os.path.abspath(testing.__path__[0])
enc_signed_file = os.path.join(
- testing_path, 'rfc822.multi-encrypt-signed.message')
+ HERE, 'rfc822.multi-encrypt-signed.message')
self.fetcher._add_verified_signature_header = Mock()
def add_verified_signature_header_called(_):