aboutsummaryrefslogtreecommitdiff
path: root/tests/client
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cynapses.org>2010-12-28 16:59:07 +0100
committerAndreas Schneider <asn@cynapses.org>2010-12-28 22:14:47 +0100
commitdf55918a41cc8a994bfcb955bd6d8ca068f5f62f (patch)
tree1c87874cd9e7f47f5b0317104a1c5a1a22e336b4 /tests/client
parente6329c72d1e37f9f1f36a389fdbae391b51d24c7 (diff)
downloadlibssh-df55918a41cc8a994bfcb955bd6d8ca068f5f62f.tar.gz
libssh-df55918a41cc8a994bfcb955bd6d8ca068f5f62f.tar.xz
libssh-df55918a41cc8a994bfcb955bd6d8ca068f5f62f.zip
tests: Migrated torture_proxycommand to cmockery.
Diffstat (limited to 'tests/client')
-rw-r--r--tests/client/CMakeLists.txt2
-rw-r--r--tests/client/torture_proxycommand.c48
2 files changed, 23 insertions, 27 deletions
diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
index 7d7eea4..f8c2d98 100644
--- a/tests/client/CMakeLists.txt
+++ b/tests/client/CMakeLists.txt
@@ -3,4 +3,4 @@ project(clienttests C)
add_cmockery_test(torture_algorithms torture_algorithms.c ${TORTURE_LIBRARY})
add_cmockery_test(torture_auth torture_auth.c ${TORTURE_LIBRARY})
add_cmockery_test(torture_knownhosts torture_knownhosts.c ${TORTURE_LIBRARY})
-#add_check_test(torture_proxycommand torture_proxycommand.c ${TORTURE_LIBRARY})
+add_cmockery_test(torture_proxycommand torture_proxycommand.c ${TORTURE_LIBRARY})
diff --git a/tests/client/torture_proxycommand.c b/tests/client/torture_proxycommand.c
index 3ee30a7..ba0e21f 100644
--- a/tests/client/torture_proxycommand.c
+++ b/tests/client/torture_proxycommand.c
@@ -3,52 +3,48 @@
#include "torture.h"
#include <libssh/libssh.h>
#include "libssh/priv.h"
-ssh_session session;
-static void setup(void) {
- session = ssh_new();
+static void setup(void **state) {
+ ssh_session session = ssh_new();
+
+ *state = session;
}
-static void teardown(void) {
- ssh_free(session);
+static void teardown(void **state) {
+ ssh_free(*state);
}
-START_TEST (torture_options_set_proxycommand)
-{
+static void torture_options_set_proxycommand(void **state) {
+ ssh_session session = *state;
int rc;
rc = ssh_options_set(session, SSH_OPTIONS_HOST, "localhost");
- ck_assert(rc == 0);
+ assert_true(rc == 0);
rc = ssh_options_set(session, SSH_OPTIONS_PROXYCOMMAND, "nc localhost 22");
- ck_assert(rc == 0);
+ assert_true(rc == 0);
rc = ssh_connect(session);
- ck_assert_msg(rc== SSH_OK,ssh_get_error(session));
+ assert_true(rc == SSH_OK);
}
-END_TEST
-START_TEST (torture_options_set_proxycommand_notexist)
-{
+static void torture_options_set_proxycommand_notexist(void **state) {
+ ssh_session session = *state;
int rc;
rc = ssh_options_set(session, SSH_OPTIONS_HOST, "localhost");
- ck_assert(rc == 0);
+ assert_true(rc == 0);
rc = ssh_options_set(session, SSH_OPTIONS_PROXYCOMMAND, "this_command_does_not_exist");
- ck_assert(rc == SSH_OK);
+ assert_true(rc == SSH_OK);
rc = ssh_connect(session);
- ck_assert_msg(rc== SSH_ERROR);
+ assert_true(rc == SSH_ERROR);
}
-END_TEST
-
-Suite *torture_make_suite(void) {
- Suite *s = suite_create("libssh_proxycommand");
-
- torture_create_case_fixture(s, "torture_options_set_proxycommand",
- torture_options_set_proxycommand, setup, teardown);
- torture_create_case_fixture(s, "torture_options_set_proxycommand_notexist",
- torture_options_set_proxycommand_notexist, setup, teardown);
+int torture_run_tests(void) {
+ const UnitTest tests[] = {
+ unit_test_setup_teardown(torture_options_set_proxycommand, setup, teardown),
+ unit_test_setup_teardown(torture_options_set_proxycommand_notexist, setup, teardown),
+ };
- return s;
+ return run_tests(tests);
}