diff options
Diffstat (limited to 'service/test')
6 files changed, 6 insertions, 8 deletions
diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py index 47674e75..67bc1124 100644 --- a/service/test/support/integration/app_test_client.py +++ b/service/test/support/integration/app_test_client.py @@ -33,13 +33,11 @@ from pixelated.adapter.model.mail import PixelatedMail from pixelated.adapter.search import SearchEngine from test.support.integration.model import MailBuilder from test.support.test_helper import request_mock -from twisted.internet.defer import succeed -from twisted.web import server from twisted.web.resource import getChildForRequest class AppTestClient: - def __init__(self, soledad_test_folder='soledad-test/test'): + def __init__(self, soledad_test_folder='/tmp/soledad-test/test'): self.soledad = initialize_soledad(tempdir=soledad_test_folder) self.mail_address = "test@pixelated.org" diff --git a/service/test/unit/bitmask_libraries/test_nicknym.py b/service/test/unit/bitmask_libraries/test_nicknym.py index 9d564abe..7dec4b2c 100644 --- a/service/test/unit/bitmask_libraries/test_nicknym.py +++ b/service/test/unit/bitmask_libraries/test_nicknym.py @@ -17,7 +17,7 @@ from mock import patch from leap.keymanager import openpgp, KeyNotFound from pixelated.bitmask_libraries.nicknym import NickNym -from abstract_leap_test import AbstractLeapTest +from test_abstract_leap import AbstractLeapTest class NickNymTest(AbstractLeapTest): diff --git a/service/test/unit/bitmask_libraries/test_provider.py b/service/test/unit/bitmask_libraries/test_provider.py index dd57afa0..af8aa291 100644 --- a/service/test/unit/bitmask_libraries/test_provider.py +++ b/service/test/unit/bitmask_libraries/test_provider.py @@ -19,7 +19,7 @@ from httmock import all_requests, HTTMock, urlmatch from requests import HTTPError from pixelated.bitmask_libraries.config import LeapConfig from pixelated.bitmask_libraries.provider import LeapProvider -from abstract_leap_test import AbstractLeapTest +from test_abstract_leap import AbstractLeapTest @all_requests diff --git a/service/test/unit/bitmask_libraries/test_session.py b/service/test/unit/bitmask_libraries/test_session.py index 0aa7861a..67722557 100644 --- a/service/test/unit/bitmask_libraries/test_session.py +++ b/service/test/unit/bitmask_libraries/test_session.py @@ -17,7 +17,7 @@ from mock import patch from mock import MagicMock from pixelated.bitmask_libraries.session import LeapSession -from abstract_leap_test import AbstractLeapTest +from test_abstract_leap import AbstractLeapTest class SessionTest(AbstractLeapTest): diff --git a/service/test/unit/bitmask_libraries/test_smtp.py b/service/test/unit/bitmask_libraries/test_smtp.py index b00a0af6..4087cbf5 100644 --- a/service/test/unit/bitmask_libraries/test_smtp.py +++ b/service/test/unit/bitmask_libraries/test_smtp.py @@ -17,7 +17,7 @@ import sys import os from mock import MagicMock, patch -from abstract_leap_test import AbstractLeapTest +from test_abstract_leap import AbstractLeapTest from pixelated.bitmask_libraries.smtp import LeapSmtp from httmock import all_requests, HTTMock, urlmatch diff --git a/service/test/unit/bitmask_libraries/test_soledad.py b/service/test/unit/bitmask_libraries/test_soledad.py index c8b45710..a71275e0 100644 --- a/service/test/unit/bitmask_libraries/test_soledad.py +++ b/service/test/unit/bitmask_libraries/test_soledad.py @@ -15,7 +15,7 @@ # along with Pixelated. If not, see <http://www.gnu.org/licenses/>. from mock import patch from pixelated.bitmask_libraries.soledad import SoledadSession -from abstract_leap_test import AbstractLeapTest +from test_abstract_leap import AbstractLeapTest @patch('pixelated.bitmask_libraries.soledad.Soledad') |