summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Reichl <preichl@redhat.com>2015-10-20 08:07:02 -0400
committerLukas Slebodnik <lslebodn@redhat.com>2015-11-12 09:38:34 +0100
commit6411cd6074688762f793de8f1dddeffcb3a71d02 (patch)
treefa88f3e6dc5a050445d60f09c8280fd9bacc3699
parent04aed439cc058413e2331e9bfbe598cc563c2c7b (diff)
downloadsssd-6411cd6074688762f793de8f1dddeffcb3a71d02.tar.gz
sssd-6411cd6074688762f793de8f1dddeffcb3a71d02.tar.xz
sssd-6411cd6074688762f793de8f1dddeffcb3a71d02.zip
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 <lslebodn@redhat.com>
-rw-r--r--src/tests/cmocka/test_pam_srv.c34
1 files changed, 19 insertions, 15 deletions
diff --git a/src/tests/cmocka/test_pam_srv.c b/src/tests/cmocka/test_pam_srv.c
index 9f0cdcdb0..30fbbc6ea 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;
}