[test] move tests to root of repo

7 files changed, 12 insertions, 9 deletions

diff --git a/src/leap/keymanager/tests/__init__.py b/tests/common.py
index a20e1fd..e532200 100644
--- a/src/leap/keymanager/tests/__init__.py
+++ b/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/src/leap/keymanager/tests/fixtures/private_key.bin b/tests/fixtures/private_key.bin
index ab17431..ab17431 100644
--- a/src/leap/keymanager/tests/fixtures/private_key.bin
+++ b/tests/fixtures/private_key.bin
diff --git a/src/leap/keymanager/tests/fixtures/public_key.bin b/tests/fixtures/public_key.bin
index ab17431..ab17431 100644
--- a/src/leap/keymanager/tests/fixtures/public_key.bin
+++ b/tests/fixtures/public_key.bin
diff --git a/src/leap/keymanager/tests/test_keymanager.py b/tests/test_keymanager.py
index c4d3fda..b4ab805 100644
--- a/src/leap/keymanager/tests/test_keymanager.py
+++ b/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/src/leap/keymanager/tests/test_migrator.py b/tests/test_migrator.py
index 76323e5..64cd8e1 100644
--- a/src/leap/keymanager/tests/test_migrator.py
+++ b/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/src/leap/keymanager/tests/test_openpgp.py b/tests/test_openpgp.py
index 17a6b79..1f78ad4 100644
--- a/src/leap/keymanager/tests/test_openpgp.py
+++ b/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/src/leap/keymanager/tests/test_validation.py b/tests/test_validation.py
index 954b1df..4aa0795 100644
--- a/src/leap/keymanager/tests/test_validation.py
+++ b/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):