aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnderson Toshiyuki Sasaki <ansasaki@redhat.com>2019-06-28 13:19:51 +0200
committerAnderson Toshiyuki Sasaki <ansasaki@redhat.com>2019-07-04 10:29:20 +0200
commitad68de7271e6ccda261df4d9fc827321e7d90fd0 (patch)
tree3cf31486834f1eb3c455ee6ecf2c40ed8e6b996a
parentfe248414fec1e654e4ee1259927d68777dd870ae (diff)
downloadlibssh-ad68de7271e6ccda261df4d9fc827321e7d90fd0.tar.gz
libssh-ad68de7271e6ccda261df4d9fc827321e7d90fd0.tar.xz
libssh-ad68de7271e6ccda261df4d9fc827321e7d90fd0.zip
tests: Check if known_hosts works with single unaccessible file
Make sure known hosts check works when local known_hosts file is unaccessible, but the host is present in global known_hosts file. Remove double return value check in previous existing test. Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com> Reviewed-by: Jakub Jelen <jjelen@redhat.com>
-rw-r--r--tests/unittests/torture_knownhosts_parsing.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/tests/unittests/torture_knownhosts_parsing.c b/tests/unittests/torture_knownhosts_parsing.c
index ac8d7f31..a087caef 100644
--- a/tests/unittests/torture_knownhosts_parsing.c
+++ b/tests/unittests/torture_knownhosts_parsing.c
@@ -384,22 +384,19 @@ static void torture_knownhosts_host_exists(void **state)
/* This makes sure the system's known_hosts are not used */
ssh_options_set(session, SSH_OPTIONS_GLOBAL_KNOWNHOSTS, "/dev/null");
-
found = ssh_session_has_known_hosts_entry(session);
assert_int_equal(found, SSH_KNOWN_HOSTS_OK);
- assert_true(found == SSH_KNOWN_HOSTS_OK);
/* This makes sure the check will not fail when the system's known_hosts is
* not accessible*/
ssh_options_set(session, SSH_OPTIONS_GLOBAL_KNOWNHOSTS, "./unaccessible");
-
found = ssh_session_has_known_hosts_entry(session);
assert_int_equal(found, SSH_KNOWN_HOSTS_OK);
- assert_true(found == SSH_KNOWN_HOSTS_OK);
+ /* This makes sure the check will fail for an unknown host */
ssh_options_set(session, SSH_OPTIONS_HOST, "wurstbrot");
found = ssh_session_has_known_hosts_entry(session);
- assert_true(found == SSH_KNOWN_HOSTS_UNKNOWN);
+ assert_int_equal(found, SSH_KNOWN_HOSTS_UNKNOWN);
ssh_free(session);
}
@@ -414,17 +411,23 @@ static void torture_knownhosts_host_exists_global(void **state)
assert_non_null(session);
ssh_options_set(session, SSH_OPTIONS_HOST, "localhost");
+ ssh_options_set(session, SSH_OPTIONS_GLOBAL_KNOWNHOSTS, knownhosts_file);
+
/* This makes sure the user's known_hosts are not used */
ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, "/dev/null");
- ssh_options_set(session, SSH_OPTIONS_GLOBAL_KNOWNHOSTS, knownhosts_file);
+ found = ssh_session_has_known_hosts_entry(session);
+ assert_int_equal(found, SSH_KNOWN_HOSTS_OK);
+ /* This makes sure the check will not fail when the user's known_hosts is
+ * not accessible*/
+ ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, "./unaccessible");
found = ssh_session_has_known_hosts_entry(session);
assert_int_equal(found, SSH_KNOWN_HOSTS_OK);
- assert_true(found == SSH_KNOWN_HOSTS_OK);
+ /* This makes sure the check will fail for an unknown host */
ssh_options_set(session, SSH_OPTIONS_HOST, "wurstbrot");
found = ssh_session_has_known_hosts_entry(session);
- assert_true(found == SSH_KNOWN_HOSTS_UNKNOWN);
+ assert_int_equal(found, SSH_KNOWN_HOSTS_UNKNOWN);
ssh_free(session);
}