tests UPDATE use shared ln2_test functionality

Author: roman

tests/CMakeLists.txt

@@ -60,32 +60,31 @@ function(libnetconf2_test)
 endfunction()
 
 # all the tests that don't require SSH and TLS
-libnetconf2_test(NAME test_unix_socket)
+libnetconf2_test(NAME test_client_messages)
 libnetconf2_test(NAME test_client_thread)
 libnetconf2_test(NAME test_fd_comm)
 libnetconf2_test(NAME test_io)
 libnetconf2_test(NAME test_thread_messages)
-libnetconf2_test(NAME test_client_messages)
+libnetconf2_test(NAME test_unix_socket)
 
 # tests depending on SSH/TLS
 if(ENABLE_SSH_TLS)
     libnetconf2_test(NAME test_auth)
-    libnetconf2_test(NAME test_two_channels)
-    libnetconf2_test(NAME test_ks_ts)
+    libnetconf2_test(NAME test_authkeys)
+    libnetconf2_test(NAME test_ch PORT_COUNT 2)
     libnetconf2_test(NAME test_ec)
     libnetconf2_test(NAME test_ed25519)
-    libnetconf2_test(NAME test_replace)
     libnetconf2_test(NAME test_endpt_share_clients PORT_COUNT 4)
-    libnetconf2_test(NAME test_tls)
-    libnetconf2_test(NAME test_ch PORT_COUNT 2)
-    libnetconf2_test(NAME test_runtime_changes PORT_COUNT 2)
-    libnetconf2_test(NAME test_authkeys)
+    libnetconf2_test(NAME test_ks_ts)
     if (LIBPAM_HAVE_CONFDIR)
         libnetconf2_test(NAME test_pam WRAP_FUNCS pam_start)
     endif()
+    libnetconf2_test(NAME test_replace)
+    libnetconf2_test(NAME test_runtime_changes PORT_COUNT 2)
+    libnetconf2_test(NAME test_tls)
+    libnetconf2_test(NAME test_two_channels)
 endif()
 
-
 include_directories(${CMAKE_SOURCE_DIR}/src ${PROJECT_BINARY_DIR})
 configure_file("${PROJECT_SOURCE_DIR}/tests/config.h.in" "${PROJECT_BINARY_DIR}/tests/config.h" ESCAPE_QUOTES @ONLY)
 

tests/test_auth.c

@@ -1,10 +1,10 @@
 /**
  * @file test_auth.c
- * @author Roman Janota <xjanot04@fit.vutbr.cz>
+ * @author Roman Janota <janota@cesnet.cz>
  * @brief libnetconf2 SSH authentication methods test
  *
  * @copyright
- * Copyright (c) 2023 CESNET, z.s.p.o.
+ * Copyright (c) 2023 - 2024 CESNET, z.s.p.o.
  *
  * This source code is licensed under BSD 3-Clause License (the "License").
  * You may not use this file except in compliance with the License.
@@ -26,52 +26,10 @@
 #include <cmocka.h>
 
 #include "ln2_test.h"
-#include "tests/config.h"
-
-#define NC_ACCEPT_TIMEOUT 2000
-#define NC_PS_POLL_TIMEOUT 2000
-
-struct ly_ctx *ctx;
-
-struct test_state {
-    pthread_barrier_t barrier;
-};
 
 int TEST_PORT = 10050;
 const char *TEST_PORT_STR = "10050";
 
-static void *
-server_thread(void *arg)
-{
-    int ret;
-    NC_MSG_TYPE msgtype;
-    struct nc_session *session;
-    struct nc_pollsession *ps;
-    struct test_state *state = arg;
-
-    (void) arg;
-
-    ps = nc_ps_new();
-    assert_non_null(ps);
-
-    /* accept a session and add it to the poll session structure */
-    pthread_barrier_wait(&state->barrier);
-    msgtype = nc_accept(NC_ACCEPT_TIMEOUT, ctx, &session);
-    assert_int_equal(msgtype, NC_MSG_HELLO);
-
-    ret = nc_ps_add_session(ps, session);
-    assert_int_equal(ret, 0);
-
-    do {
-        ret = nc_ps_poll(ps, NC_PS_POLL_TIMEOUT, NULL);
-        assert_int_equal(ret & NC_PSPOLL_RPC, NC_PSPOLL_RPC);
-    } while (!(ret & NC_PSPOLL_SESSION_TERM));
-
-    nc_ps_clear(ps, 1, NULL);
-    nc_ps_free(ps);
-    return NULL;
-}
-
 static char *
 auth_password(const char *username, const char *hostname, void *priv)
 {
@@ -91,7 +49,7 @@ client_thread_password(void *arg)
 {
     int ret;
     struct nc_session *session = NULL;
-    struct test_state *state = arg;
+    struct ln2_test_ctx *test_ctx = arg;
 
     /* skip all hostkey and known_hosts checks */
     nc_client_ssh_set_knownhosts_mode(NC_SSH_KNOWNHOSTS_SKIP);
@@ -108,7 +66,7 @@ client_thread_password(void *arg)
     nc_client_ssh_set_auth_pref(NC_SSH_AUTH_PASSWORD, 1);
     nc_client_ssh_set_auth_pref(NC_SSH_AUTH_INTERACTIVE, -1);
 
-    pthread_barrier_wait(&state->barrier);
+    pthread_barrier_wait(&test_ctx->barrier);
     session = nc_connect_ssh("127.0.0.1", TEST_PORT, NULL);
     assert_non_null(session);
 
@@ -126,7 +84,7 @@ test_nc_auth_password(void **state)
 
     ret = pthread_create(&tids[0], NULL, client_thread_password, *state);
     assert_int_equal(ret, 0);
-    ret = pthread_create(&tids[1], NULL, server_thread, *state);
+    ret = pthread_create(&tids[1], NULL, ln2_glob_test_server_thread, *state);
     assert_int_equal(ret, 0);
 
     for (i = 0; i < 2; i++) {
@@ -139,7 +97,7 @@ client_thread_pubkey(void *arg)
 {
     int ret;
     struct nc_session *session = NULL;
-    struct test_state *state = arg;
+    struct ln2_test_ctx *test_ctx = arg;
 
     /* skip all hostkey and known_hosts checks */
     nc_client_ssh_set_knownhosts_mode(NC_SSH_KNOWNHOSTS_SKIP);
@@ -157,7 +115,7 @@ client_thread_pubkey(void *arg)
     ret = nc_client_ssh_add_keypair(TESTS_DIR "/data/key_rsa.pub", TESTS_DIR "/data/key_rsa");
     assert_int_equal(ret, 0);
 
-    pthread_barrier_wait(&state->barrier);
+    pthread_barrier_wait(&test_ctx->barrier);
     session = nc_connect_ssh("127.0.0.1", TEST_PORT, NULL);
     assert_non_null(session);
 
@@ -175,7 +133,7 @@ test_nc_auth_pubkey(void **state)
 
     ret = pthread_create(&tids[0], NULL, client_thread_pubkey, *state);
     assert_int_equal(ret, 0);
-    ret = pthread_create(&tids[1], NULL, server_thread, *state);
+    ret = pthread_create(&tids[1], NULL, ln2_glob_test_server_thread, *state);
     assert_int_equal(ret, 0);
 
     for (i = 0; i < 2; i++) {
@@ -188,7 +146,7 @@ client_thread_none(void *arg)
 {
     int ret;
     struct nc_session *session = NULL;
-    struct test_state *state = arg;
+    struct ln2_test_ctx *test_ctx = arg;
 
     /* skip all hostkey and known_hosts checks */
     nc_client_ssh_set_knownhosts_mode(NC_SSH_KNOWNHOSTS_SKIP);
@@ -199,7 +157,7 @@ client_thread_none(void *arg)
     ret = nc_client_ssh_set_username("test_none");
     assert_int_equal(ret, 0);
 
-    pthread_barrier_wait(&state->barrier);
+    pthread_barrier_wait(&test_ctx->barrier);
     session = nc_connect_ssh("127.0.0.1", TEST_PORT, NULL);
     assert_non_null(session);
 
@@ -217,7 +175,7 @@ test_nc_auth_none(void **state)
 
     ret = pthread_create(&tids[0], NULL, client_thread_none, *state);
     assert_int_equal(ret, 0);
-    ret = pthread_create(&tids[1], NULL, server_thread, *state);
+    ret = pthread_create(&tids[1], NULL, ln2_glob_test_server_thread, *state);
     assert_int_equal(ret, 0);
 
     for (i = 0; i < 2; i++) {
@@ -230,87 +188,45 @@ setup_f(void **state)
 {
     int ret;
     struct lyd_node *tree = NULL;
-    struct test_state *test_state;
-
-    nc_verbosity(NC_VERB_VERBOSE);
-
-    /* init barrier */
-    test_state = malloc(sizeof *test_state);
-    assert_non_null(test_state);
+    struct ln2_test_ctx *test_ctx;
 
-    ret = pthread_barrier_init(&test_state->barrier, NULL, 2);
+    ret = ln2_glob_test_setup(&test_ctx);
     assert_int_equal(ret, 0);
 
-    *state = test_state;
-
-    ret = ly_ctx_new(MODULES_DIR, 0, &ctx);
-    assert_int_equal(ret, 0);
+    *state = test_ctx;
 
-    ret = nc_server_init_ctx(&ctx);
+    ret = nc_server_config_add_address_port(test_ctx->ctx, "endpt", NC_TI_SSH, "127.0.0.1", TEST_PORT, &tree);
     assert_int_equal(ret, 0);
 
-    ret = nc_server_config_load_modules(&ctx);
+    ret = nc_server_config_add_ssh_hostkey(test_ctx->ctx, "endpt", "hostkey", TESTS_DIR "/data/key_ecdsa", NULL, &tree);
     assert_int_equal(ret, 0);
 
-    ret = nc_server_config_add_address_port(ctx, "endpt", NC_TI_SSH, "127.0.0.1", TEST_PORT, &tree);
+    ret = nc_server_config_add_ssh_user_pubkey(test_ctx->ctx, "endpt", "test_pk", "pubkey", TESTS_DIR "/data/key_rsa.pub", &tree);
     assert_int_equal(ret, 0);
 
-    ret = nc_server_config_add_ssh_hostkey(ctx, "endpt", "hostkey", TESTS_DIR "/data/key_ecdsa", NULL, &tree);
+    ret = nc_server_config_add_ssh_user_password(test_ctx->ctx, "endpt", "test_pw", "testpw", &tree);
     assert_int_equal(ret, 0);
 
-    ret = nc_server_config_add_ssh_user_pubkey(ctx, "endpt", "test_pk", "pubkey", TESTS_DIR "/data/key_rsa.pub", &tree);
-    assert_int_equal(ret, 0);
-
-    ret = nc_server_config_add_ssh_user_password(ctx, "endpt", "test_pw", "testpw", &tree);
-    assert_int_equal(ret, 0);
-
-    ret = lyd_new_path(tree, ctx, "/ietf-netconf-server:netconf-server/listen/endpoints/endpoint[name='endpt']/ssh/"
+    ret = lyd_new_path(tree, test_ctx->ctx, "/ietf-netconf-server:netconf-server/listen/endpoints/endpoint[name='endpt']/ssh/"
             "ssh-server-parameters/client-authentication/users/user[name='test_none']/none", NULL, 0, NULL);
     assert_int_equal(ret, 0);
 
     /* configure the server based on the data */
     ret = nc_server_config_setup_data(tree);
     assert_int_equal(ret, 0);
 
-    ret = nc_server_init();
-    assert_int_equal(ret, 0);
-
-    /* initialize client */
-    ret = nc_client_init();
-    assert_int_equal(ret, 0);
-
     lyd_free_all(tree);
 
     return 0;
 }
 
-static int
-teardown_f(void **state)
-{
-    int ret = 0;
-    struct test_state *test_state;
-
-    assert_non_null(state);
-    test_state = *state;
-
-    ret = pthread_barrier_destroy(&test_state->barrier);
-    assert_int_equal(ret, 0);
-
-    free(*state);
-    nc_client_destroy();
-    nc_server_destroy();
-    ly_ctx_destroy(ctx);
-
-    return 0;
-}
-
 int
 main(void)
 {
     const struct CMUnitTest tests[] = {
-        cmocka_unit_test_setup_teardown(test_nc_auth_pubkey, setup_f, teardown_f),
-        cmocka_unit_test_setup_teardown(test_nc_auth_password, setup_f, teardown_f),
-        cmocka_unit_test_setup_teardown(test_nc_auth_none, setup_f, teardown_f)
+        cmocka_unit_test_setup_teardown(test_nc_auth_pubkey, setup_f, ln2_glob_test_teardown),
+        cmocka_unit_test_setup_teardown(test_nc_auth_password, setup_f, ln2_glob_test_teardown),
+        cmocka_unit_test_setup_teardown(test_nc_auth_none, setup_f, ln2_glob_test_teardown)
     };
 
     /* try to get ports from the environment, otherwise use the default */