From 6411cd6074688762f793de8f1dddeffcb3a71d02 Mon Sep 17 00:00:00 2001 From: Pavel Reichl Date: Nov 12 2015 08:38:34 +0000 Subject: pam-srv-tests: split pam_test_setup() so it can be reused Split pam_test_setup() so domain and pam parameters can be easily set distinctly for each test. Resolves: https://fedorahosted.org/sssd/ticket/2697 Reviewed-by: Lukáš Slebodník --- diff --git a/src/tests/cmocka/test_pam_srv.c b/src/tests/cmocka/test_pam_srv.c index 9f0cdcd..30fbbc6 100644 --- a/src/tests/cmocka/test_pam_srv.c +++ b/src/tests/cmocka/test_pam_srv.c @@ -247,22 +247,9 @@ void test_pam_setup(struct sss_test_conf_param dom_params[], pam_test_ctx->cctx->ev = pam_test_ctx->tctx->ev; } -static int pam_test_setup(void **state) +static void pam_test_setup_common(void) { - int ret; - - struct sss_test_conf_param dom_params[] = { - { "enumerate", "false" }, - { "cache_credentials", "true" }, - { NULL, NULL }, /* Sentinel */ - }; - - struct sss_test_conf_param pam_params[] = { - { "p11_child_timeout", "30"}, - { NULL, NULL }, /* Sentinel */ - }; - - test_pam_setup(dom_params, pam_params, state); + errno_t ret; /* Prime the cache with a valid user */ ret = sysdb_add_user(pam_test_ctx->tctx->dom, @@ -293,7 +280,24 @@ static int pam_test_setup(void **state) discard_const("wronguser"), pam_test_ctx->pctx->id_timeout); assert_int_equal(ret, EOK); +} + +static int pam_test_setup(void **state) +{ + struct sss_test_conf_param dom_params[] = { + { "enumerate", "false" }, + { "cache_credentials", "true" }, + { NULL, NULL }, /* Sentinel */ + }; + + struct sss_test_conf_param pam_params[] = { + { "p11_child_timeout", "30" }, + { NULL, NULL }, /* Sentinel */ + }; + + test_pam_setup(dom_params, pam_params, state); + pam_test_setup_common(); return 0; }