lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-05 20:55:46 +03:00
Code Activity

tests: Use assert_ssh_return_code() in client tests

Browse Source 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Andreas Schneider
2018-07-03 07:45:51 +02:00
parent 584c345451
commit e73ae60e1a
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/client/torture_forward.c
View File

@@ -84,7 +84,7 @@ static void torture_ssh_forward(void **state)
int rc; int rc;
rc = ssh_channel_listen_forward(session, "127.0.0.21", 8080, &bound_port); rc = ssh_channel_listen_forward(session, "127.0.0.21", 8080, &bound_port);
assert_int_equal(rc, SSH_OK); assert_ssh_return_code(session, rc);
c = ssh_channel_accept_forward(session, 10, &dport); c = ssh_channel_accept_forward(session, 10, &dport);
/* We do not get a listener and run into the timeout here */ /* We do not get a listener and run into the timeout here */

8
tests/client/torture_knownhosts_verify.c
View File

@@ -96,10 +96,10 @@ static void torture_knownhosts_export(void **state)
int rc; int rc;
rc = ssh_connect(session); rc = ssh_connect(session);
assert_int_equal(rc, SSH_OK); assert_ssh_return_code(session, rc);
rc = ssh_session_export_known_hosts_entry(session, &entry); rc = ssh_session_export_known_hosts_entry(session, &entry);
assert_int_equal(rc, SSH_OK); assert_ssh_return_code(session, rc);
p = strstr(entry, "ssh-ed25519"); p = strstr(entry, "ssh-ed25519");
if (p != NULL) { if (p != NULL) {
@@ -118,10 +118,10 @@ static void torture_knownhosts_write_and_verify(void **state)
int rc; int rc;
rc = ssh_connect(session); rc = ssh_connect(session);
assert_int_equal(rc, SSH_OK); assert_ssh_return_code(session, rc);
rc = ssh_session_update_known_hosts(session); rc = ssh_session_update_known_hosts(session);
assert_int_equal(rc, SSH_OK); assert_ssh_return_code(session, rc);
found = ssh_session_is_known_server(session); found = ssh_session_is_known_server(session);
assert_int_equal(found, SSH_KNOWN_HOSTS_OK); assert_int_equal(found, SSH_KNOWN_HOSTS_OK);

7
tests/client/torture_proxycommand.c
View File

@@ -61,7 +61,7 @@ static void torture_options_set_proxycommand(void **state) {
rc = ssh_options_set(session, SSH_OPTIONS_PROXYCOMMAND, "nc 127.0.0.10 22"); rc = ssh_options_set(session, SSH_OPTIONS_PROXYCOMMAND, "nc 127.0.0.10 22");
assert_int_equal(rc, 0); assert_int_equal(rc, 0);
rc = ssh_connect(session); rc = ssh_connect(session);
assert_int_equal(rc, SSH_OK); assert_ssh_return_code(session, rc);
} }
static void torture_options_set_proxycommand_notexist(void **state) { static void torture_options_set_proxycommand_notexist(void **state) {
@@ -70,9 +70,10 @@ static void torture_options_set_proxycommand_notexist(void **state) {
int rc; int rc;
rc = ssh_options_set(session, SSH_OPTIONS_PROXYCOMMAND, "this_command_does_not_exist"); rc = ssh_options_set(session, SSH_OPTIONS_PROXYCOMMAND, "this_command_does_not_exist");
assert_int_equal(rc, SSH_OK); assert_ssh_return_code(session, rc);
rc = ssh_connect(session); rc = ssh_connect(session);
assert_int_equal(rc, SSH_ERROR); assert_ssh_return_code_equal(session, rc, SSH_ERROR);
} }
int torture_run_tests(void) { int torture_run_tests(void) {

6
tests/client/torture_request_env.c
View File

@@ -84,13 +84,13 @@ static void torture_request_env(void **state)
assert_non_null(c); assert_non_null(c);
rc = ssh_channel_open_session(c); rc = ssh_channel_open_session(c);
assert_int_equal(rc, SSH_OK); assert_ssh_return_code(session, rc);
rc = ssh_channel_request_env(c, "LC_LIBSSH", "LIBSSH_EXPORTED_VARIABLE"); rc = ssh_channel_request_env(c, "LC_LIBSSH", "LIBSSH_EXPORTED_VARIABLE");
assert_int_equal(rc, SSH_OK); assert_ssh_return_code(session, rc);
rc = ssh_channel_request_exec(c, "echo $LC_LIBSSH"); rc = ssh_channel_request_exec(c, "echo $LC_LIBSSH");
assert_int_equal(rc, SSH_OK); assert_ssh_return_code(session, rc);
nbytes = ssh_channel_read(c, buffer, sizeof(buffer) - 1, 0); nbytes = ssh_channel_read(c, buffer, sizeof(buffer) - 1, 0);
printf("nbytes=%d\n", nbytes); printf("nbytes=%d\n", nbytes);

8
tests/client/torture_session.c
View File

@@ -86,10 +86,10 @@ static void torture_channel_read_error(void **state) {
assert_non_null(channel); assert_non_null(channel);
rc = ssh_channel_open_session(channel); rc = ssh_channel_open_session(channel);
assert_int_equal(rc, SSH_OK); assert_ssh_return_code(session, rc);
rc = ssh_channel_request_exec(channel, "hexdump -C /dev/urandom"); rc = ssh_channel_request_exec(channel, "hexdump -C /dev/urandom");
assert_int_equal(rc, SSH_OK); assert_ssh_return_code(session, rc);
/* send crap and for server to send us a disconnect */ /* send crap and for server to send us a disconnect */
rc = write(ssh_get_fd(session),"AAAA", 4); rc = write(ssh_get_fd(session),"AAAA", 4);
@@ -102,9 +102,9 @@ static void torture_channel_read_error(void **state) {
} }
#if OPENSSH_VERSION_MAJOR == 6 && OPENSSH_VERSION_MINOR >= 7 #if OPENSSH_VERSION_MAJOR == 6 && OPENSSH_VERSION_MINOR >= 7
/* With openssh 6.7 this doesn't produce and error anymore */ /* With openssh 6.7 this doesn't produce and error anymore */
assert_int_equal(rc, SSH_OK); assert_ssh_return_code(session, rc);
#else #else
assert_int_equal(rc, SSH_ERROR); assert_ssh_return_code_equal(session, rc, SSH_ERROR);
#endif #endif
ssh_channel_free(channel); ssh_channel_free(channel);