>From bc8fd57de30abad8c2b5e74def22927bb2870830 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Mon, 23 Jun 2014 17:50:45 +0200 Subject: [PATCH 1/6] TESTS: Add confdb domain base DN to sss_test_ctx Creation of the path to the domain's confdb entry was duplicated in the tests. Rather than adding yet another duplication, I added the path as another field of the sss_test_ctx structure. --- src/tests/cmocka/test_dp_opts.c | 6 +----- src/tests/cmocka/test_dyndns.c | 5 +---- src/tests/common.h | 1 + src/tests/common_dom.c | 8 ++++++++ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/tests/cmocka/test_dp_opts.c b/src/tests/cmocka/test_dp_opts.c index f3029940d48e8fe72b25dfb66e3cf4a589a0960f..31dde47c75b1fada1dd03f18c59c34066c5f79a9 100644 --- a/src/tests/cmocka/test_dp_opts.c +++ b/src/tests/cmocka/test_dp_opts.c @@ -210,7 +210,6 @@ void opt_test_get(void **state) int ret; struct sss_test_ctx *tctx; struct dp_option *opts; - char *dompath; struct sss_test_conf_param params[] = { { "string_nodefault", "stringval2" }, { "blob_nodefault", "blobval2" }, @@ -227,10 +226,7 @@ void opt_test_get(void **state) TEST_DOM_NAME, TEST_ID_PROVIDER, params); assert_non_null(tctx); - dompath = talloc_asprintf(tctx, "config/domain/%s", TEST_DOM_NAME); - assert_non_null(dompath); - - ret = dp_get_options(global_talloc_context, tctx->confdb, dompath, + ret = dp_get_options(global_talloc_context, tctx->confdb, tctx->conf_dom_path, test_def_opts, OPT_NUM_OPTS, &opts); assert_int_equal(ret, EOK); diff --git a/src/tests/cmocka/test_dyndns.c b/src/tests/cmocka/test_dyndns.c index dcf6eede398ee5b3a71d5f81c932c856bc307929..db90e661cba032dc230478dbb10cae1109c37f05 100644 --- a/src/tests/cmocka/test_dyndns.c +++ b/src/tests/cmocka/test_dyndns.c @@ -369,10 +369,7 @@ void dyndns_test_setup(void **state) dyndns_test_ctx->be_ctx->cdb = dyndns_test_ctx->tctx->confdb; dyndns_test_ctx->be_ctx->ev = dyndns_test_ctx->tctx->ev; - dyndns_test_ctx->be_ctx->conf_path = talloc_asprintf(dyndns_test_ctx, - CONFDB_DOMAIN_PATH_TMPL, - TEST_DOM_NAME); - assert_non_null(dyndns_test_ctx->be_ctx->conf_path); + dyndns_test_ctx->be_ctx->conf_path = dyndns_test_ctx->tctx->conf_dom_path; } void dyndns_test_teardown(void **state) diff --git a/src/tests/common.h b/src/tests/common.h index 2e71b2295cfc5ba434eaca701e351de78d8533a7..9065db39ea5d0db0351447cfb2c9c14f4d9468e5 100644 --- a/src/tests/common.h +++ b/src/tests/common.h @@ -64,6 +64,7 @@ struct sss_test_ctx { struct sss_domain_info *dom; struct sss_names_ctx *nctx; char *confdb_path; + char *conf_dom_path; bool done; int error; diff --git a/src/tests/common_dom.c b/src/tests/common_dom.c index d3a7781c330d73370c0e6dbc629e20d546a841c3..b96db8d9084fea9ec07be88d9c5f72c6885d8f09 100644 --- a/src/tests/common_dom.c +++ b/src/tests/common_dom.c @@ -53,6 +53,14 @@ create_dom_test_ctx(TALLOC_CTX *mem_ctx, goto fail; } + test_ctx->conf_dom_path = talloc_asprintf(test_ctx, + CONFDB_DOMAIN_PATH_TMPL, + domain_name); + if (test_ctx->conf_dom_path == NULL) { + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_asprintf failed\n"); + goto fail; + } + /* Connect to the conf db */ ret = confdb_init(test_ctx, &test_ctx->confdb, test_ctx->confdb_path); if (ret != EOK) { -- 1.9.3