summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2016-07-11 20:50:01 +0200
committerRuben Pollan <meskio@sindominio.net>2016-07-12 16:40:38 +0200
commitf331a5ebb7bb99390877c07856a44d08b9d418c0 (patch)
tree43ae8afe4c294b497335181df5ffadb5e79d933b
parent83c246f9877f4e381e0eb97e2b920f4c0bd37ab9 (diff)
[test] move tests to root of repo
-rw-r--r--keymanager/tests/common.py (renamed from keymanager/src/leap/keymanager/tests/__init__.py)3
-rw-r--r--keymanager/tests/fixtures/private_key.bin (renamed from keymanager/src/leap/keymanager/tests/fixtures/private_key.bin)bin2202 -> 2202 bytes
-rw-r--r--keymanager/tests/fixtures/public_key.bin (renamed from keymanager/src/leap/keymanager/tests/fixtures/public_key.bin)bin2202 -> 2202 bytes
-rw-r--r--keymanager/tests/test_keymanager.py (renamed from keymanager/src/leap/keymanager/tests/test_keymanager.py)3
-rw-r--r--keymanager/tests/test_migrator.py (renamed from keymanager/src/leap/keymanager/tests/test_migrator.py)3
-rw-r--r--keymanager/tests/test_openpgp.py (renamed from keymanager/src/leap/keymanager/tests/test_openpgp.py)3
-rw-r--r--keymanager/tests/test_validation.py (renamed from keymanager/src/leap/keymanager/tests/test_validation.py)9
7 files changed, 12 insertions, 9 deletions
diff --git a/keymanager/src/leap/keymanager/tests/__init__.py b/keymanager/tests/common.py
index a20e1fd..e532200 100644
--- a/keymanager/src/leap/keymanager/tests/__init__.py
+++ b/keymanager/tests/common.py
@@ -100,7 +100,8 @@ class KeyManagerWithSoledadTestCase(unittest.TestCase, BaseLeapTest):
return binary_public_key.read()
def get_private_binary_key(self):
- with open(PATH + '/fixtures/private_key.bin', 'r') as binary_private_key:
+ with open(
+ PATH + '/fixtures/private_key.bin', 'r') as binary_private_key:
return binary_private_key.read()
diff --git a/keymanager/src/leap/keymanager/tests/fixtures/private_key.bin b/keymanager/tests/fixtures/private_key.bin
index ab17431..ab17431 100644
--- a/keymanager/src/leap/keymanager/tests/fixtures/private_key.bin
+++ b/keymanager/tests/fixtures/private_key.bin
Binary files differ
diff --git a/keymanager/src/leap/keymanager/tests/fixtures/public_key.bin b/keymanager/tests/fixtures/public_key.bin
index ab17431..ab17431 100644
--- a/keymanager/src/leap/keymanager/tests/fixtures/public_key.bin
+++ b/keymanager/tests/fixtures/public_key.bin
Binary files differ
diff --git a/keymanager/src/leap/keymanager/tests/test_keymanager.py b/keymanager/tests/test_keymanager.py
index c4d3fda..b4ab805 100644
--- a/keymanager/src/leap/keymanager/tests/test_keymanager.py
+++ b/keymanager/tests/test_keymanager.py
@@ -41,7 +41,8 @@ from leap.keymanager.keys import (
build_key_from_dict,
)
from leap.keymanager.validation import ValidationLevels
-from leap.keymanager.tests import (
+
+from common import (
KeyManagerWithSoledadTestCase,
ADDRESS,
ADDRESS_2,
diff --git a/keymanager/src/leap/keymanager/tests/test_migrator.py b/keymanager/tests/test_migrator.py
index 76323e5..64cd8e1 100644
--- a/keymanager/src/leap/keymanager/tests/test_migrator.py
+++ b/keymanager/tests/test_migrator.py
@@ -42,7 +42,8 @@ from leap.keymanager.documents import (
KEY_SIGN_USED_KEY,
)
from leap.keymanager.validation import ValidationLevels
-from leap.keymanager.tests import (
+
+from common import (
KeyManagerWithSoledadTestCase,
ADDRESS,
ADDRESS_2,
diff --git a/keymanager/src/leap/keymanager/tests/test_openpgp.py b/keymanager/tests/test_openpgp.py
index 17a6b79..1f78ad4 100644
--- a/keymanager/src/leap/keymanager/tests/test_openpgp.py
+++ b/keymanager/tests/test_openpgp.py
@@ -34,7 +34,8 @@ from leap.keymanager.documents import (
TYPE_ADDRESS_PRIVATE_INDEX,
)
from leap.keymanager.keys import OpenPGPKey
-from leap.keymanager.tests import (
+
+from common import (
KeyManagerWithSoledadTestCase,
ADDRESS,
ADDRESS_2,
diff --git a/keymanager/src/leap/keymanager/tests/test_validation.py b/keymanager/tests/test_validation.py
index 954b1df..4aa0795 100644
--- a/keymanager/src/leap/keymanager/tests/test_validation.py
+++ b/keymanager/tests/test_validation.py
@@ -22,10 +22,10 @@ import unittest
from datetime import datetime
from twisted.internet.defer import inlineCallbacks
-from leap.keymanager.errors import (
- KeyNotValidUpgrade
-)
-from leap.keymanager.tests import (
+from leap.keymanager.errors import KeyNotValidUpgrade
+from leap.keymanager.validation import ValidationLevels
+
+from common import (
KeyManagerWithSoledadTestCase,
ADDRESS,
PUBLIC_KEY,
@@ -34,7 +34,6 @@ from leap.keymanager.tests import (
PRIVATE_KEY_2,
KEY_FINGERPRINT
)
-from leap.keymanager.validation import ValidationLevels
class ValidationLevelsTestCase(KeyManagerWithSoledadTestCase):