diff options
author | Jakub Jelen <jjelen@redhat.com> | 2018-10-30 12:52:32 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2018-11-02 11:16:38 +0100 |
commit | 9aa47fef99504fdc59ea50b44c87e0b23c4cf1af (patch) | |
tree | 9d6c1a4c8a3ebbc2b15ef04f19a8a736ec4487a7 | |
parent | de7405f1c710228c572609f7a3fa0e0cf779599d (diff) | |
download | libssh-9aa47fef99504fdc59ea50b44c87e0b23c4cf1af.tar.gz libssh-9aa47fef99504fdc59ea50b44c87e0b23c4cf1af.tar.xz libssh-9aa47fef99504fdc59ea50b44c87e0b23c4cf1af.zip |
tests: Adjust test that require complete config re-parsing
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
-rw-r--r-- | tests/unittests/torture_config.c | 7 | ||||
-rw-r--r-- | tests/unittests/torture_options.c | 12 |
2 files changed, 19 insertions, 0 deletions
diff --git a/tests/unittests/torture_config.c b/tests/unittests/torture_config.c index 283b8de5..5a8452da 100644 --- a/tests/unittests/torture_config.c +++ b/tests/unittests/torture_config.c @@ -287,6 +287,7 @@ static void torture_config_auth_methods(void **state) { assert_int_equal(session->opts.flags, 0); /* gradually enable them again */ + SAFE_FREE(session->opts.options_seen); ssh_options_set(session, SSH_OPTIONS_HOST, "gss"); ret = ssh_config_parse_file(session, LIBSSH_TESTCONFIG8); assert_true(ret == 0); @@ -341,29 +342,34 @@ static void torture_config_match(void **state) assert_string_equal(session->opts.host, "all-matched.com"); /* Hostname example does simple hostname matching */ + SAFE_FREE(session->opts.options_seen); ssh_options_set(session, SSH_OPTIONS_HOST, "example"); ret = ssh_config_parse_file(session, LIBSSH_TESTCONFIG10); assert_true(ret == 0); assert_string_equal(session->opts.host, "example.com"); /* We can match also both hosts from a comma separated list */ + SAFE_FREE(session->opts.options_seen); ssh_options_set(session, SSH_OPTIONS_HOST, "example1"); ret = ssh_config_parse_file(session, LIBSSH_TESTCONFIG10); assert_true(ret == 0); assert_string_equal(session->opts.host, "exampleN"); + SAFE_FREE(session->opts.options_seen); ssh_options_set(session, SSH_OPTIONS_HOST, "example2"); ret = ssh_config_parse_file(session, LIBSSH_TESTCONFIG10); assert_true(ret == 0); assert_string_equal(session->opts.host, "exampleN"); /* We can match by user */ + SAFE_FREE(session->opts.options_seen); ssh_options_set(session, SSH_OPTIONS_USER, "guest"); ret = ssh_config_parse_file(session, LIBSSH_TESTCONFIG10); assert_true(ret == 0); assert_string_equal(session->opts.host, "guest.com"); /* We can combine two options on a single line to match both of them */ + SAFE_FREE(session->opts.options_seen); ssh_options_set(session, SSH_OPTIONS_USER, "tester"); ssh_options_set(session, SSH_OPTIONS_HOST, "testhost"); ret = ssh_config_parse_file(session, LIBSSH_TESTCONFIG10); @@ -371,6 +377,7 @@ static void torture_config_match(void **state) assert_string_equal(session->opts.host, "testhost.com"); /* We can also negate conditions */ + SAFE_FREE(session->opts.options_seen); ssh_options_set(session, SSH_OPTIONS_USER, "not-tester"); ssh_options_set(session, SSH_OPTIONS_HOST, "testhost"); ret = ssh_config_parse_file(session, LIBSSH_TESTCONFIG10); diff --git a/tests/unittests/torture_options.c b/tests/unittests/torture_options.c index 448fbfbf..9f6cd146 100644 --- a/tests/unittests/torture_options.c +++ b/tests/unittests/torture_options.c @@ -451,22 +451,26 @@ static void torture_options_config_host(void **state) { assert_int_equal(session->opts.port, 42); + SAFE_FREE(session->opts.options_seen); ssh_options_set(session, SSH_OPTIONS_HOST, "testhost2"); ssh_options_parse_config(session, "test_config"); assert_int_equal(session->opts.port, 43); session->opts.port = 0; + SAFE_FREE(session->opts.options_seen); ssh_options_set(session, SSH_OPTIONS_HOST, "testhost3"); ssh_options_parse_config(session, "test_config"); assert_int_equal(session->opts.port, 43); + SAFE_FREE(session->opts.options_seen); ssh_options_set(session, SSH_OPTIONS_HOST, "testhost4"); ssh_options_parse_config(session, "test_config"); assert_int_equal(session->opts.port, 44); session->opts.port = 0; + SAFE_FREE(session->opts.options_seen); ssh_options_set(session, SSH_OPTIONS_HOST, "testhost5"); ssh_options_parse_config(session, "test_config"); assert_int_equal(session->opts.port, 44); @@ -494,6 +498,7 @@ static void torture_options_config_match(void **state) assert_ssh_return_code_equal(session, rv, SSH_ERROR); /* The Match all keyword needs to be the only one (start) */ + SAFE_FREE(session->opts.options_seen); config = fopen("test_config", "w"); assert_non_null(config); fputs("Match all host local\n", @@ -504,6 +509,7 @@ static void torture_options_config_match(void **state) assert_ssh_return_code_equal(session, rv, SSH_ERROR); /* The Match all keyword needs to be the only one (end) */ + SAFE_FREE(session->opts.options_seen); config = fopen("test_config", "w"); assert_non_null(config); fputs("Match host local all\n", @@ -514,6 +520,7 @@ static void torture_options_config_match(void **state) assert_ssh_return_code_equal(session, rv, SSH_ERROR); /* The Match host keyword requires an argument */ + SAFE_FREE(session->opts.options_seen); config = fopen("test_config", "w"); assert_non_null(config); fputs("Match host\n", @@ -524,6 +531,7 @@ static void torture_options_config_match(void **state) assert_ssh_return_code_equal(session, rv, SSH_ERROR); /* The Match user keyword requires an argument */ + SAFE_FREE(session->opts.options_seen); config = fopen("test_config", "w"); assert_non_null(config); fputs("Match user\n", @@ -534,6 +542,7 @@ static void torture_options_config_match(void **state) assert_ssh_return_code_equal(session, rv, SSH_ERROR); /* The Match canonical keyword is ignored */ + SAFE_FREE(session->opts.options_seen); config = fopen("test_config", "w"); assert_non_null(config); fputs("Match canonical\n" @@ -550,6 +559,7 @@ static void torture_options_config_match(void **state) session->opts.port = 0; /* The Match originalhost keyword is ignored */ + SAFE_FREE(session->opts.options_seen); config = fopen("test_config", "w"); assert_non_null(config); fputs("Match originalhost origin\n" @@ -566,6 +576,7 @@ static void torture_options_config_match(void **state) session->opts.port = 0; /* The Match localuser keyword is ignored */ + SAFE_FREE(session->opts.options_seen); config = fopen("test_config", "w"); assert_non_null(config); fputs("Match originalhost origin\n" @@ -582,6 +593,7 @@ static void torture_options_config_match(void **state) session->opts.port = 0; /* The Match exec keyword is ignored */ + SAFE_FREE(session->opts.options_seen); config = fopen("test_config", "w"); assert_non_null(config); fputs("Match exec /bin/true\n" |