Commit 52e09724 by Carlos Martín Nieto

ssh: skip the localhost cert check earlier

Skip it before we attempt to clone, as we would exit with -1 on systems
which do not have sshd running.
parent 4fe5b771
...@@ -483,8 +483,7 @@ int ssh_certificate_check(git_cert *cert, int valid, void *payload) ...@@ -483,8 +483,7 @@ int ssh_certificate_check(git_cert *cert, int valid, void *payload)
GIT_UNUSED(payload); GIT_UNUSED(payload);
expected_str = cl_getenv("GITTEST_REMOTE_SSH_FINGERPRINT"); expected_str = cl_getenv("GITTEST_REMOTE_SSH_FINGERPRINT");
if (!expected_str) cl_assert(expected_str);
cl_skip();
cl_git_pass(git_oid_fromstrp(&expected, expected_str)); cl_git_pass(git_oid_fromstrp(&expected, expected_str));
cl_assert_equal_i(GIT_CERT_HOSTKEY_LIBSSH2, cert->cert_type); cl_assert_equal_i(GIT_CERT_HOSTKEY_LIBSSH2, cert->cert_type);
...@@ -512,6 +511,9 @@ void test_online_clone__ssh_cert(void) ...@@ -512,6 +511,9 @@ void test_online_clone__ssh_cert(void)
{ {
g_options.remote_callbacks.certificate_check = ssh_certificate_check; g_options.remote_callbacks.certificate_check = ssh_certificate_check;
if (!cl_getenv("GITTEST_REMOTE_SSH_FINGERPRINT"))
cl_skip();
cl_git_fail_with(GIT_EUSER, git_clone(&g_repo, "ssh://localhost/foo", "./foo", &g_options)); cl_git_fail_with(GIT_EUSER, git_clone(&g_repo, "ssh://localhost/foo", "./foo", &g_options));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment