summaryrefslogtreecommitdiffhomepage
path: root/tests/test_client.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-09-22 12:54:51 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-09-22 12:54:51 -0700
commit519d5a034de887982136fcfdb6dffef47e46dd88 (patch)
tree2e6c0265b86d35d26b323923c176eed1ca621b67 /tests/test_client.py
parentf511eaf487d59fe60271b2e4aac5fe0470fecf92 (diff)
Move cert tests & copies of related keys into separate folder.
This prevents non-cert-related tests from incidentally loading the certs, which was masking issues (re #1071)
Diffstat (limited to 'tests/test_client.py')
-rw-r--r--tests/test_client.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/test_client.py b/tests/test_client.py
index 5d616fcf..7058f394 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -266,7 +266,8 @@ class SSHClientTest (unittest.TestCase):
# server-side behavior is 100% identical.)
# NOTE: only bothered whipping up one cert per overall class/family.
for type_ in ('rsa', 'dss', 'ecdsa_256', 'ed25519'):
- cert_path = test_path('test_{0}.key-cert.pub'.format(type_))
+ cert_name = 'test_{0}.key-cert.pub'.format(type_)
+ cert_path = test_path(os.path.join('cert_support', cert_name))
self._test_connection(
key_filename=cert_path,
public_blob=PublicBlob.from_file(cert_path),
@@ -280,7 +281,8 @@ class SSHClientTest (unittest.TestCase):
# that a specific cert was found, along with regular authorization
# succeeding proving that the overall flow works.
for type_ in ('rsa', 'dss', 'ecdsa_256', 'ed25519'):
- key_path = test_path('test_{0}.key'.format(type_))
+ key_name = 'test_{0}.key'.format(type_)
+ key_path = test_path(os.path.join('cert_support', key_name))
self._test_connection(
key_filename=key_path,
public_blob=PublicBlob.from_file(