aboutsummaryrefslogtreecommitdiff
path: root/tests/client
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2014-10-13 10:00:25 +0200
committerAndreas Schneider <asn@cryptomilk.org>2016-01-14 08:04:49 +0100
commitd403c01a30c31a3194ec937a803ef7c7e97ca6a5 (patch)
tree3d78a3c990b8d9925bd353368550031d7ebe1fc5 /tests/client
parent14f1ce2e5b760fff940c102464d05d059a021a9d (diff)
downloadlibssh-d403c01a30c31a3194ec937a803ef7c7e97ca6a5.tar.gz
libssh-d403c01a30c31a3194ec937a803ef7c7e97ca6a5.tar.xz
libssh-d403c01a30c31a3194ec937a803ef7c7e97ca6a5.zip
tests: Convert torture_connect to a cwrap test
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'tests/client')
-rw-r--r--tests/client/CMakeLists.txt24
-rw-r--r--tests/client/torture_connect.c76
2 files changed, 74 insertions, 26 deletions
diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
index 616060c3..3f6f2758 100644
--- a/tests/client/CMakeLists.txt
+++ b/tests/client/CMakeLists.txt
@@ -1,8 +1,9 @@
project(clienttests C)
+find_package(socket_wrapper)
+
add_cmocka_test(torture_algorithms torture_algorithms.c ${TORTURE_LIBRARY})
add_cmocka_test(torture_auth torture_auth.c ${TORTURE_LIBRARY})
-add_cmocka_test(torture_connect torture_connect.c ${TORTURE_LIBRARY})
add_cmocka_test(torture_knownhosts torture_knownhosts.c ${TORTURE_LIBRARY})
add_cmocka_test(torture_proxycommand torture_proxycommand.c ${TORTURE_LIBRARY})
add_cmocka_test(torture_session torture_session.c ${TORTURE_LIBRARY})
@@ -13,3 +14,24 @@ if (WITH_SFTP)
add_cmocka_test(torture_sftp_dir torture_sftp_dir.c ${TORTURE_LIBRARY})
add_cmocka_test(torture_sftp_read torture_sftp_read.c ${TORTURE_LIBRARY})
endif (WITH_SFTP)
+
+set(LIBSSH_CLIENT_TESTS
+ torture_connect)
+
+foreach(_CLI_TEST ${LIBSSH_CLIENT_TESTS})
+ add_cmocka_test(${_CLI_TEST} ${_CLI_TEST}.c ${TORTURE_LIBRARY})
+
+ if (OSX)
+ set_property(
+ TEST
+ ${_CLI_TEST}
+ PROPERTY
+ ENVIRONMENT DYLD_FORCE_FLAT_NAMESPACE=1;DYLD_INSERT_LIBRARIES=${SOCKET_WRAPPER_LIBRARY})
+ else ()
+ set_property(
+ TEST
+ ${_CLI_TEST}
+ PROPERTY
+ ENVIRONMENT ${TORTURE_ENVIRONMENT})
+ endif()
+endforeach()
diff --git a/tests/client/torture_connect.c b/tests/client/torture_connect.c
index 4a588f10..662d0366 100644
--- a/tests/client/torture_connect.c
+++ b/tests/client/torture_connect.c
@@ -28,35 +28,52 @@
#include <netinet/in.h>
#include <sys/types.h>
#include <sys/socket.h>
-#define HOST "localhost"
+
/* Should work until Apnic decides to assign it :) */
#define BLACKHOLE "1.1.1.1"
-static int setup(void **state) {
- int verbosity=torture_libssh_verbosity();
- ssh_session session = ssh_new();
+static int sshd_setup(void **state)
+{
+ torture_setup_sshd_server(state);
- ssh_options_set(session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity);
+ return 0;
+}
- *state = session;
+static int sshd_teardown(void **state) {
+ torture_teardown_sshd_server(state);
return 0;
}
-static int teardown(void **state) {
- ssh_session session = *state;
- ssh_disconnect(session);
- ssh_free(session);
+static int session_setup(void **state)
+{
+ struct torture_state *s = *state;
+ int verbosity = torture_libssh_verbosity();
+
+ s->ssh.session = ssh_new();
+ assert_non_null(s->ssh.session);
+
+ ssh_options_set(s->ssh.session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity);
return 0;
}
-static void torture_connect_nonblocking(void **state) {
- ssh_session session = *state;
+static int session_teardown(void **state)
+{
+ struct torture_state *s = *state;
+ ssh_disconnect(s->ssh.session);
+ ssh_free(s->ssh.session);
+
+ return 0;
+}
+
+static void torture_connect_nonblocking(void **state) {
+ struct torture_state *s = *state;
+ ssh_session session = s->ssh.session;
int rc;
- rc = ssh_options_set(session, SSH_OPTIONS_HOST, HOST);
+ rc = ssh_options_set(session, SSH_OPTIONS_HOST, TORTURE_SSH_SERVER);
assert_true(rc == SSH_OK);
ssh_set_blocking(session,0);
@@ -68,8 +85,10 @@ static void torture_connect_nonblocking(void **state) {
assert_true(rc == SSH_OK);
}
+#if 0 /* This does not work with socket_wrapper */
static void torture_connect_timeout(void **state) {
- ssh_session session = *state;
+ struct torture_state *s = *state;
+ ssh_session session = s->ssh.session;
struct timeval before, after;
int rc;
long timeout = 2;
@@ -94,13 +113,15 @@ static void torture_connect_timeout(void **state) {
sec--;
assert_in_range(sec, 1, 3);
}
+#endif
static void torture_connect_double(void **state) {
- ssh_session session = *state;
+ struct torture_state *s = *state;
+ ssh_session session = s->ssh.session;
int rc;
- rc = ssh_options_set(session, SSH_OPTIONS_HOST, HOST);
+ rc = ssh_options_set(session, SSH_OPTIONS_HOST, TORTURE_SSH_SERVER);
assert_true(rc == SSH_OK);
rc = ssh_connect(session);
assert_true(rc == SSH_OK);
@@ -116,12 +137,15 @@ static void torture_connect_failure(void **state) {
* ssh_new/ssh_disconnect/ssh_free sequence doesn't crash/leak
* and the behavior of a double ssh_disconnect
*/
- ssh_session session = *state;
+ struct torture_state *s = *state;
+ ssh_session session = s->ssh.session;
+
ssh_disconnect(session);
}
static void torture_connect_socket(void **state) {
- ssh_session session = *state;
+ struct torture_state *s = *state;
+ ssh_session session = s->ssh.session;
int rc;
int sock_fd = 0;
@@ -132,7 +156,7 @@ static void torture_connect_socket(void **state) {
server_addr.sin_family = AF_INET;
server_addr.sin_port = htons(22);
- server_addr.sin_addr.s_addr = inet_addr("127.0.0.1");
+ server_addr.sin_addr.s_addr = inet_addr(TORTURE_SSH_SERVER);
rc = connect(sock_fd, (struct sockaddr *)&server_addr, sizeof(server_addr));
assert_true(rc == 0);
@@ -146,17 +170,19 @@ static void torture_connect_socket(void **state) {
int torture_run_tests(void) {
int rc;
struct CMUnitTest tests[] = {
- cmocka_unit_test_setup_teardown(torture_connect_nonblocking, setup, teardown),
- cmocka_unit_test_setup_teardown(torture_connect_double, setup, teardown),
- cmocka_unit_test_setup_teardown(torture_connect_failure, setup, teardown),
- cmocka_unit_test_setup_teardown(torture_connect_timeout, setup, teardown),
- cmocka_unit_test_setup_teardown(torture_connect_socket, setup, teardown),
+ cmocka_unit_test_setup_teardown(torture_connect_nonblocking, session_setup, session_teardown),
+ cmocka_unit_test_setup_teardown(torture_connect_double, session_setup, session_teardown),
+ cmocka_unit_test_setup_teardown(torture_connect_failure, session_setup, session_teardown),
+#if 0
+ cmocka_unit_test_setup_teardown(torture_connect_timeout, session_setup, session_teardown),
+#endif
+ cmocka_unit_test_setup_teardown(torture_connect_socket, session_setup, session_teardown),
};
ssh_init();
torture_filter_tests(tests);
- rc = cmocka_run_group_tests(tests, NULL, NULL);
+ rc = cmocka_run_group_tests(tests, sshd_setup, sshd_teardown);
ssh_finalize();
return rc;