TEST: Remove unused argument sysdb_path

Name of sysdb file is automatically generated from domain name and db_path
in function sysdb_domain_init.

talloc_asprintf is called with arguments "%s/cache_%s.ldb", db_path, dom->name

Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>

7 files changed, 12 insertions, 17 deletions

diff --git a/src/tests/cmocka/test_dp_opts.c b/src/tests/cmocka/test_dp_opts.c
index 07998b403..f3029940d 100644
--- a/src/tests/cmocka/test_dp_opts.c
+++ b/src/tests/cmocka/test_dp_opts.c
@@ -32,8 +32,8 @@
 
 #define TESTS_PATH "tests_opts"
 #define TEST_CONF_DB "test_opt_conf.ldb"
-#define TEST_SYSDB_FILE "cache_opt_test.ldb"
 #define TEST_DOM_NAME "opt_test"
+#define TEST_SYSDB_FILE "cache_"TEST_DOM_NAME".ldb"
 #define TEST_ID_PROVIDER "ldap"
 
 enum test_opts {
@@ -224,8 +224,7 @@ void opt_test_get(void **state)
     bool bo;
 
     tctx = create_dom_test_ctx(global_talloc_context, TESTS_PATH, TEST_CONF_DB,
-                               TEST_SYSDB_FILE, TEST_DOM_NAME,
-                               TEST_ID_PROVIDER, params);
+                               TEST_DOM_NAME, TEST_ID_PROVIDER, params);
     assert_non_null(tctx);
 
     dompath = talloc_asprintf(tctx, "config/domain/%s", TEST_DOM_NAME);
diff --git a/src/tests/cmocka/test_dyndns.c b/src/tests/cmocka/test_dyndns.c
index 316ba5dee..dcf6eede3 100644
--- a/src/tests/cmocka/test_dyndns.c
+++ b/src/tests/cmocka/test_dyndns.c
@@ -37,8 +37,8 @@
 
 #define TESTS_PATH "tests_dyndns"
 #define TEST_CONF_DB "test_dyndns_conf.ldb"
-#define TEST_SYSDB_FILE "cache_dyndns_test.ldb"
 #define TEST_DOM_NAME "dyndns_test"
+#define TEST_SYSDB_FILE "cache_"TEST_DOM_NAME".ldb"
 #define TEST_ID_PROVIDER "ldap"
 
 enum mock_nsupdate_states {
@@ -360,9 +360,8 @@ void dyndns_test_setup(void **state)
     assert_non_null(dyndns_test_ctx);
 
     dyndns_test_ctx->tctx = create_dom_test_ctx(dyndns_test_ctx, TESTS_PATH,
-                                                TEST_CONF_DB, TEST_SYSDB_FILE,
-                                                TEST_DOM_NAME, TEST_ID_PROVIDER,
-                                                params);
+                                                TEST_CONF_DB, TEST_DOM_NAME,
+                                                TEST_ID_PROVIDER, params);
     assert_non_null(dyndns_test_ctx->tctx);
 
     dyndns_test_ctx->be_ctx = talloc_zero(dyndns_test_ctx, struct be_ctx);
diff --git a/src/tests/cmocka/test_negcache.c b/src/tests/cmocka/test_negcache.c
index 605e27f04..eff55b080 100644
--- a/src/tests/cmocka/test_negcache.c
+++ b/src/tests/cmocka/test_negcache.c
@@ -52,8 +52,8 @@
 #define UID "U-1-2-3-4-5"
 #define TESTS_PATH "tests_ncache"
 #define TEST_CONF_DB "test_nss_conf.ldb"
-#define TEST_SYSDB_FILE "cache_nss_test.ldb"
 #define TEST_DOM_NAME "nss_test"
+#define TEST_SYSDB_FILE "cache_"TEST_DOM_NAME".ldb"
 #define TEST_SUBDOM_NAME "test.sub"
 #define TEST_ID_PROVIDER "ldap"
 
@@ -598,8 +598,7 @@ static void test_sss_ncache_prepopulate(void **state)
     assert_non_null(ts->nctx);
 
     tc = create_dom_test_ctx(ts, TESTS_PATH, TEST_CONF_DB,
-                             TEST_SYSDB_FILE, NAME,
-                             TEST_ID_PROVIDER, params);
+                             NAME, TEST_ID_PROVIDER, params);
     assert_non_null(tc);
 
     ncache = ts->ctx;
diff --git a/src/tests/cmocka/test_nested_groups.c b/src/tests/cmocka/test_nested_groups.c
index 144eada1e..c79c8f02e 100644
--- a/src/tests/cmocka/test_nested_groups.c
+++ b/src/tests/cmocka/test_nested_groups.c
@@ -31,8 +31,8 @@
 
 #define TESTS_PATH "tests_ldap_nested_groups"
 #define TEST_CONF_DB "test_ldap_nested_groups_conf.ldb"
-#define TEST_SYSDB_FILE "cache_ldap_nested_groups_test.ldb"
 #define TEST_DOM_NAME "ldap_nested_groups_test"
+#define TEST_SYSDB_FILE "cache_"TEST_DOM_NAME".ldb"
 #define TEST_ID_PROVIDER "ldap"
 
 #define new_test(test) \
@@ -129,7 +129,7 @@ void nested_groups_test_setup(void **state)
 
     /* initialize domain */
     test_ctx->tctx = create_dom_test_ctx(test_ctx, TESTS_PATH, TEST_CONF_DB,
-                                         TEST_SYSDB_FILE, TEST_DOM_NAME,
+                                         TEST_DOM_NAME,
                                          TEST_ID_PROVIDER, params);
     assert_non_null(test_ctx->tctx);
 
diff --git a/src/tests/cmocka/test_nss_srv.c b/src/tests/cmocka/test_nss_srv.c
index 359ae4466..56bd57bd1 100644
--- a/src/tests/cmocka/test_nss_srv.c
+++ b/src/tests/cmocka/test_nss_srv.c
@@ -35,8 +35,8 @@
 
 #define TESTS_PATH "tests_nss"
 #define TEST_CONF_DB "test_nss_conf.ldb"
-#define TEST_SYSDB_FILE "cache_nss_test.ldb"
 #define TEST_DOM_NAME "nss_test"
+#define TEST_SYSDB_FILE "cache_"TEST_DOM_NAME".ldb"
 #define TEST_SUBDOM_NAME "test.sub"
 #define TEST_ID_PROVIDER "ldap"
 
@@ -596,8 +596,8 @@ void test_nss_setup(struct sss_test_conf_param params[],
     nss_test_ctx = talloc_zero(NULL, struct nss_test_ctx);
     assert_non_null(nss_test_ctx);
 
-    nss_test_ctx->tctx = create_dom_test_ctx(nss_test_ctx, TESTS_PATH, TEST_CONF_DB,
-                                             TEST_SYSDB_FILE, TEST_DOM_NAME,
+    nss_test_ctx->tctx = create_dom_test_ctx(nss_test_ctx, TESTS_PATH,
+                                             TEST_CONF_DB, TEST_DOM_NAME,
                                              TEST_ID_PROVIDER, params);
     assert_non_null(nss_test_ctx->tctx);
 
diff --git a/src/tests/common.h b/src/tests/common.h
index ba3a50a71..149356af4 100644
--- a/src/tests/common.h
+++ b/src/tests/common.h
@@ -79,7 +79,6 @@ struct sss_test_ctx *
 create_dom_test_ctx(TALLOC_CTX *mem_ctx,
                     const char *tests_path,
                     const char *confdb_path,
-                    const char *sysdb_path,
                     const char *domain_name,
                     const char *id_provider,
                     struct sss_test_conf_param *params);
diff --git a/src/tests/common_dom.c b/src/tests/common_dom.c
index 053b78ec3..514eaac77 100644
--- a/src/tests/common_dom.c
+++ b/src/tests/common_dom.c
@@ -29,7 +29,6 @@ struct sss_test_ctx *
 create_dom_test_ctx(TALLOC_CTX *mem_ctx,
                     const char *tests_path,
                     const char *confdb_path,
-                    const char *sysdb_path,
                     const char *domain_name,
                     const char *id_provider,
                     struct sss_test_conf_param *params)