From bbc9f8acd48ec8f7e64e134f81be2199e695df52 Mon Sep 17 00:00:00 2001 From: Alexey Tikhonov Date: Apr 03 2019 20:52:09 +0000 Subject: TESTS: two `negcache` tests were merged Resolves: https://pagure.io/SSSD/sssd/issue/3989 Reviewed-by: Tomas Halman --- diff --git a/Makefile.am b/Makefile.am index 21d3cda..19e5c70 100644 --- a/Makefile.am +++ b/Makefile.am @@ -239,7 +239,6 @@ if HAVE_CMOCKA test-find-uid \ test-io \ test-negcache \ - negcache_2-tests \ test-authtok \ test_prompt_config \ sss_nss_idmap-tests \ @@ -2859,7 +2858,8 @@ EXTRA_test_negcache_DEPENDENCIES = \ test_negcache_SOURCES = \ $(SSSD_RESPONDER_OBJ) \ src/tests/cmocka/common_mock_resp.c \ - src/tests/cmocka/test_negcache.c + src/tests/cmocka/test_negcache.c \ + src/tests/cmocka/test_negcache_2.c test_negcache_CFLAGS = \ $(AM_CFLAGS) \ $(TALLOC_CFLAGS) \ @@ -2876,26 +2876,6 @@ test_negcache_LDADD = \ libsss_sbus.la \ $(NULL) -negcache_2_tests_SOURCES =\ - $(SSSD_RESPONDER_OBJ) \ - src/tests/cmocka/test_negcache_2.c \ - $(NULL) -negcache_2_tests_CFLAGS = \ - $(AM_CFLAGS) \ - -DBASE_FILE_STEM=\"$(*F)\" \ - $(NULL) -negcache_2_tests_LDADD = \ - $(LIBADD_DL) \ - $(CMOCKA_LIBS) \ - $(SSSD_LIBS) \ - $(SYSTEMD_DAEMON_LIBS) \ - libsss_util.la \ - libsss_iface.la \ - libsss_test_common.la \ - libsss_debug.la \ - libsss_sbus.la \ - $(NULL) - test_authtok_SOURCES = \ src/tests/cmocka/test_authtok.c \ src/util/authtok.c \ diff --git a/src/tests/cmocka/test_negcache.c b/src/tests/cmocka/test_negcache.c index 9bddddd..7ab8a09 100644 --- a/src/tests/cmocka/test_negcache.c +++ b/src/tests/cmocka/test_negcache.c @@ -43,6 +43,25 @@ #include "responder/common/responder.h" #include "responder/common/negcache.h" +int test_ncache_setup(void **state); +int test_ncache_teardown(void **state); +void test_ncache_nocache_user(void **state); +void test_ncache_local_user(void **state); +void test_ncache_domain_user(void **state); +void test_ncache_both_user(void **state); +void test_ncache_nocache_uid(void **state); +void test_ncache_local_uid(void **state); +void test_ncache_domain_uid(void **state); +void test_ncache_both_uid(void **state); +void test_ncache_nocache_group(void **state); +void test_ncache_local_group(void **state); +void test_ncache_domain_group(void **state); +void test_ncache_both_group(void **state); +void test_ncache_nocache_gid(void **state); +void test_ncache_local_gid(void **state); +void test_ncache_domain_gid(void **state); +void test_ncache_both_gid(void **state); + #define PORT 21 #define SID "S-1-2-3-4-5" #define CERT "MIIECTCCAvGgAwIBAgIBCTANBgkqhkiG9w0BAQsFADA0MRIwEAYDVQQKDAlJUEEuREVWRUwxHjAcBgNVBAMMFUNlcnRpZmljYXRlIEF1dGhvcml0eTAeFw0xNTA0MjgxMDIxMTFaFw0xNzA0MjgxMDIxMTFaMDIxEjAQBgNVBAoMCUlQQS5ERVZFTDEcMBoGA1UEAwwTaXBhLWRldmVsLmlwYS5kZXZlbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALIykqtHuAwTVEofHikG/9BQy/dfeZFlsTkBg2qtnnc78w3XufbcnkpJp9Bmcsy/d9beqf5nlsxJ8TcjLsRQ9Ou6YtQjTfM3OILuOz8s0ICbF6qb66bd9hX/BrLO/9+KnpWFSR+E/YEmzgYyDTbKfBWBaGuPPrOi/K6vwkRYFZVA/FYZkYDtQhFmBO884HYzS4P6frRH3PvtRqWNCmaHpe97dGKsvnM2ybT+IMSB8/54GajQr3+BciRh2XaT4wvSTxkXM1fUgrDxqAP2AZmpuIyDyboZh+rWOwbrTPfx5SipELZG3uHhP8HMcr4qQ8b20LWgxCRuT73sIooHET350xUCAwEAAaOCASYwggEiMB8GA1UdIwQYMBaAFPKdQk4PxEglWC8czg+hPyLIVciRMDsGCCsGAQUFBwEBBC8wLTArBggrBgEFBQcwAYYfaHR0cDovL2lwYS1jYS5pcGEuZGV2ZWwvY2Evb2NzcDAOBgNVHQ8BAf8EBAMCBPAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMHQGA1UdHwRtMGswaaAxoC+GLWh0dHA6Ly9pcGEtY2EuaXBhLmRldmVsL2lwYS9jcmwvTWFzdGVyQ1JMLmJpbqI0pDIwMDEOMAwGA1UECgwFaXBhY2ExHjAcBgNVBAMMFUNlcnRpZmljYXRlIEF1dGhvcml0eTAdBgNVHQ4EFgQULSs/y/Wy/zIsqMIc3b2MgB7dMYIwDQYJKoZIhvcNAQELBQADggEBAJpHLlCnTR1TD8lxQgzl2n1JZOeryN/fAsGH0Vve2m8r5PC+ugnfAoULiuabBn1pOGxy/0x7Kg0/Iy8WRv8Fk7DqJCjXEqFXuFkZJfNDCtP9DzeNuMoV50iKoMfHS38BPFjXN+X/fSsBrA2fUWrlQCTmXlUN97gvQqxt5Slrxgukvxm9OSfu/sWz22LUvtJHupYwWv1iALgnXS86lAuVNYVALLxn34r58XsZlj5CSBMjBJWpaxEzgUdag3L2IPqOQXuPd0d8x11G9E/9gQquOSe2aiZjsdO/VYOCmzZsM2QPUMBVlBPDhfTVcWXQwN385uycW/ARtSzzSME2jKKWSIQ=" @@ -1057,6 +1076,59 @@ int main(void) setup, teardown), cmocka_unit_test_setup_teardown(test_sss_ncache_domain_locate_type, setup, teardown), + + /* user */ + cmocka_unit_test_setup_teardown(test_ncache_nocache_user, + test_ncache_setup, + test_ncache_teardown), + cmocka_unit_test_setup_teardown(test_ncache_local_user, + test_ncache_setup, + test_ncache_teardown), + cmocka_unit_test_setup_teardown(test_ncache_domain_user, + test_ncache_setup, + test_ncache_teardown), + cmocka_unit_test_setup_teardown(test_ncache_both_user, + test_ncache_setup, + test_ncache_teardown), + /* uid */ + cmocka_unit_test_setup_teardown(test_ncache_nocache_uid, + test_ncache_setup, + test_ncache_teardown), + cmocka_unit_test_setup_teardown(test_ncache_local_uid, + test_ncache_setup, + test_ncache_teardown), + cmocka_unit_test_setup_teardown(test_ncache_domain_uid, + test_ncache_setup, + test_ncache_teardown), + cmocka_unit_test_setup_teardown(test_ncache_both_uid, + test_ncache_setup, + test_ncache_teardown), + /* group */ + cmocka_unit_test_setup_teardown(test_ncache_nocache_group, + test_ncache_setup, + test_ncache_teardown), + cmocka_unit_test_setup_teardown(test_ncache_local_group, + test_ncache_setup, + test_ncache_teardown), + cmocka_unit_test_setup_teardown(test_ncache_domain_group, + test_ncache_setup, + test_ncache_teardown), + cmocka_unit_test_setup_teardown(test_ncache_both_group, + test_ncache_setup, + test_ncache_teardown), + /* gid */ + cmocka_unit_test_setup_teardown(test_ncache_nocache_gid, + test_ncache_setup, + test_ncache_teardown), + cmocka_unit_test_setup_teardown(test_ncache_local_gid, + test_ncache_setup, + test_ncache_teardown), + cmocka_unit_test_setup_teardown(test_ncache_domain_gid, + test_ncache_setup, + test_ncache_teardown), + cmocka_unit_test_setup_teardown(test_ncache_both_gid, + test_ncache_setup, + test_ncache_teardown), }; tests_set_cwd(); diff --git a/src/tests/cmocka/test_negcache_2.c b/src/tests/cmocka/test_negcache_2.c index 690e797..087ec46 100644 --- a/src/tests/cmocka/test_negcache_2.c +++ b/src/tests/cmocka/test_negcache_2.c @@ -100,18 +100,6 @@ static void create_groups(struct ncache_test_ctx *test_ctx) } } -/* register_cli_protocol_version is required in test since it links with - * responder_common.c module - */ -struct cli_protocol_version *register_cli_protocol_version(void) -{ - static struct cli_protocol_version responder_test_cli_protocol_version[] = { - { 0, NULL, NULL } - }; - - return responder_test_cli_protocol_version; -} - static void find_local_users(struct ncache_test_ctx *test_ctx) { int i; @@ -220,7 +208,7 @@ static void find_non_local_groups(struct ncache_test_ctx *test_ctx) assert_int_equal(i, 2); } -static int test_ncache_setup(void **state) +int test_ncache_setup(void **state) { struct ncache_test_ctx *test_ctx; @@ -250,7 +238,7 @@ static int test_ncache_setup(void **state) return 0; } -static int test_ncache_teardown(void **state) +int test_ncache_teardown(void **state) { struct ncache_test_ctx *test_ctx; @@ -758,93 +746,3 @@ void test_ncache_both_gid(void **state) talloc_zfree(test_ctx->ncache); } - -int main(int argc, const char *argv[]) -{ - int rv; - poptContext pc; - int opt; - struct poptOption long_options[] = { - POPT_AUTOHELP - SSSD_DEBUG_OPTS - POPT_TABLEEND - }; - - const struct CMUnitTest tests[] = { - /* user */ - cmocka_unit_test_setup_teardown(test_ncache_nocache_user, - test_ncache_setup, - test_ncache_teardown), - cmocka_unit_test_setup_teardown(test_ncache_local_user, - test_ncache_setup, - test_ncache_teardown), - cmocka_unit_test_setup_teardown(test_ncache_domain_user, - test_ncache_setup, - test_ncache_teardown), - cmocka_unit_test_setup_teardown(test_ncache_both_user, - test_ncache_setup, - test_ncache_teardown), - /* uid */ - cmocka_unit_test_setup_teardown(test_ncache_nocache_uid, - test_ncache_setup, - test_ncache_teardown), - cmocka_unit_test_setup_teardown(test_ncache_local_uid, - test_ncache_setup, - test_ncache_teardown), - cmocka_unit_test_setup_teardown(test_ncache_domain_uid, - test_ncache_setup, - test_ncache_teardown), - cmocka_unit_test_setup_teardown(test_ncache_both_uid, - test_ncache_setup, - test_ncache_teardown), - /* group */ - cmocka_unit_test_setup_teardown(test_ncache_nocache_group, - test_ncache_setup, - test_ncache_teardown), - cmocka_unit_test_setup_teardown(test_ncache_local_group, - test_ncache_setup, - test_ncache_teardown), - cmocka_unit_test_setup_teardown(test_ncache_domain_group, - test_ncache_setup, - test_ncache_teardown), - cmocka_unit_test_setup_teardown(test_ncache_both_group, - test_ncache_setup, - test_ncache_teardown), - /* gid */ - cmocka_unit_test_setup_teardown(test_ncache_nocache_gid, - test_ncache_setup, - test_ncache_teardown), - cmocka_unit_test_setup_teardown(test_ncache_local_gid, - test_ncache_setup, - test_ncache_teardown), - cmocka_unit_test_setup_teardown(test_ncache_domain_gid, - test_ncache_setup, - test_ncache_teardown), - cmocka_unit_test_setup_teardown(test_ncache_both_gid, - test_ncache_setup, - test_ncache_teardown), - }; - - /* Set debug level to invalid value so we can decide if -d 0 was used. */ - debug_level = SSSDBG_INVALID; - - pc = poptGetContext(argv[0], argc, argv, long_options, 0); - while ((opt = poptGetNextOpt(pc)) != -1) { - switch (opt) { - default: - fprintf(stderr, "\nInvalid option %s: %s\n\n", - poptBadOption(pc, 0), poptStrerror(opt)); - poptPrintUsage(pc, stderr, 0); - return 1; - } - } - poptFreeContext(pc); - - DEBUG_CLI_INIT(debug_level); - - tests_set_cwd(); - test_dom_suite_cleanup(TESTS_PATH, TEST_CONF_DB, TEST_DOM_NAME); - rv = cmocka_run_group_tests(tests, NULL, NULL); - - return rv; -}