diff options
author | Tomás Touceda <chiiph@leap.se> | 2014-01-09 17:14:40 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2014-01-09 17:14:40 -0300 |
commit | 51392198f87a271ddc0080370cc8b6b203774123 (patch) | |
tree | 63ff37515eb399bb0b806f0825a573d966500faf /src/leap/bitmask/provider/tests/test_providerbootstrapper.py | |
parent | dffaa3c58d12c91e31d5a95d3cf43c00a9ce4604 (diff) | |
parent | 785380dfa7b3f6205b52be2a90afa9b0afa04c5e (diff) |
Merge remote-tracking branch 'refs/remotes/ivan/feature/4636_warn-user-if-outdated-app' into develop
Diffstat (limited to 'src/leap/bitmask/provider/tests/test_providerbootstrapper.py')
-rw-r--r-- | src/leap/bitmask/provider/tests/test_providerbootstrapper.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/leap/bitmask/provider/tests/test_providerbootstrapper.py b/src/leap/bitmask/provider/tests/test_providerbootstrapper.py index d8336fec..6cf3e469 100644 --- a/src/leap/bitmask/provider/tests/test_providerbootstrapper.py +++ b/src/leap/bitmask/provider/tests/test_providerbootstrapper.py @@ -36,17 +36,17 @@ from nose.twistedtools import deferred, reactor from twisted.internet import threads from requests.models import Response +from leap.bitmask import provider +from leap.bitmask import util +from leap.bitmask.backend import Signaler from leap.bitmask.config.providerconfig import ProviderConfig from leap.bitmask.crypto.tests import fake_provider from leap.bitmask.provider.providerbootstrapper import ProviderBootstrapper from leap.bitmask.provider.providerbootstrapper import UnsupportedProviderAPI from leap.bitmask.provider.providerbootstrapper import WrongFingerprint -from leap.bitmask.provider.supportedapis import SupportedAPIs -from leap.bitmask.backend import Signaler -from leap.bitmask import util from leap.common.files import mkdir_p -from leap.common.testing.https_server import where from leap.common.testing.basetest import BaseLeapTest +from leap.common.testing.https_server import where class ProviderBootstrapperTest(BaseLeapTest): @@ -489,7 +489,7 @@ class ProviderBootstrapperActiveTest(unittest.TestCase): 'leap.bitmask.config.providerconfig.ProviderConfig.get_ca_cert_path', lambda x: where('cacert.pem')) def test_download_provider_info_unsupported_api(self): - self._setup_provider_config_with(SupportedAPIs.SUPPORTED_APIS[0], + self._setup_provider_config_with(provider.SUPPORTED_APIS[0], tempfile.mkdtemp()) self._setup_providerbootstrapper(False) self._produce_dummy_provider_json() |