diff options
author | Duda Dornelles <ddornell@thoughtworks.com> | 2014-10-15 09:42:08 +0200 |
---|---|---|
committer | Duda Dornelles <ddornell@thoughtworks.com> | 2014-10-15 09:42:08 +0200 |
commit | 89d26f3cd389f41b83d27ea225944a0ff8bc2e95 (patch) | |
tree | 31275a0e7c350fd2b9acc2d1210d972bb9a0d3c8 /service/test/unit/bitmask_libraries | |
parent | 6d08b8e65d2c1679d4b489ac196116847f91b3a7 (diff) |
Getting rid of singletons and optimizing imports
Diffstat (limited to 'service/test/unit/bitmask_libraries')
-rw-r--r-- | service/test/unit/bitmask_libraries/abstract_leap_test.py | 3 | ||||
-rw-r--r-- | service/test/unit/bitmask_libraries/leap_srp_test.py | 2 | ||||
-rw-r--r-- | service/test/unit/bitmask_libraries/provider_test.py | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/service/test/unit/bitmask_libraries/abstract_leap_test.py b/service/test/unit/bitmask_libraries/abstract_leap_test.py index ddcfb08f..2634f330 100644 --- a/service/test/unit/bitmask_libraries/abstract_leap_test.py +++ b/service/test/unit/bitmask_libraries/abstract_leap_test.py @@ -13,10 +13,11 @@ # # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see <http://www.gnu.org/licenses/>. -import os import tempfile import unittest from uuid import uuid4 + +import os from mock import Mock, MagicMock diff --git a/service/test/unit/bitmask_libraries/leap_srp_test.py b/service/test/unit/bitmask_libraries/leap_srp_test.py index 591929ce..6d067e5d 100644 --- a/service/test/unit/bitmask_libraries/leap_srp_test.py +++ b/service/test/unit/bitmask_libraries/leap_srp_test.py @@ -21,9 +21,9 @@ from urlparse import parse_qs from httmock import urlmatch, all_requests, HTTMock, response from requests.exceptions import Timeout import srp - from pixelated.bitmask_libraries.leap_srp import LeapSecureRemotePassword, LeapAuthException + (salt_bytes, verification_key_bytes) = srp.create_salted_verification_key('username', 'password', hash_alg=srp.SHA256, ng_type=srp.NG_1024) verifier = None diff --git a/service/test/unit/bitmask_libraries/provider_test.py b/service/test/unit/bitmask_libraries/provider_test.py index 41cf3bf4..dd57afa0 100644 --- a/service/test/unit/bitmask_libraries/provider_test.py +++ b/service/test/unit/bitmask_libraries/provider_test.py @@ -17,7 +17,6 @@ import json 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 |