From ad68de7271e6ccda261df4d9fc827321e7d90fd0 Mon Sep 17 00:00:00 2001 From: Anderson Toshiyuki Sasaki Date: Fri, 28 Jun 2019 13:19:51 +0200 Subject: [PATCH] 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 Reviewed-by: Jakub Jelen --- tests/unittests/torture_knownhosts_parsing.c | 21 +++++++++++--------- 1 file changed, 12 insertions(+), 9 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"); - /* 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); + /* This makes sure the user's known_hosts are not used */ + ssh_options_set(session, SSH_OPTIONS_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 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); + + /* 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); }