Commit 52e09724fde2d46c1f31d07f6445dc7b4dee3947
2014-09-16T17:13:58
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.
diff --git a/tests/online/clone.c b/tests/online/clone.c
index 42682e8..f7f3aae 100644
--- a/tests/online/clone.c
+++ b/tests/online/clone.c
@@ -483,8 +483,7 @@ int ssh_certificate_check(git_cert *cert, int valid, void *payload)
GIT_UNUSED(payload);
expected_str = cl_getenv("GITTEST_REMOTE_SSH_FINGERPRINT");
- if (!expected_str)
- cl_skip();
+ cl_assert(expected_str);
cl_git_pass(git_oid_fromstrp(&expected, expected_str));
cl_assert_equal_i(GIT_CERT_HOSTKEY_LIBSSH2, cert->cert_type);
@@ -512,6 +511,9 @@ void test_online_clone__ssh_cert(void)
{
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));
}