ehlo,
Few comments to some patches.
0001-TEST-Remove-unused-argument-sysdb_path.patch
Name of sysdb file is automatically generated from domain name and db_path
in function sysdb_domain_init.
0002-TEST-Use-right-domain-name-in-negcache-test.patch
Directory tests_ncache was not removed after negcache test,
because sysdb cache had different name and was not removed in the function
test_dom_suite_cleanup.
[sssd] [test_dom_suite_cleanup] (0x0020):
Could not delete the test dir (39) (Directory not empty)
0004-hbac-test-Use-defined-macros-instead-of-strings.patch
Macro HBAC_TEST_SRCHOSTGROUP2 was defined but it was not used anywhere.
LS
>From d754e565cc8b2b323fe7260264d78e85f9184256 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <[email protected]>
Date: Fri, 7 Mar 2014 13:03:19 +0100
Subject: [PATCH 1/5] 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
---
src/tests/cmocka/test_dp_opts.c | 5 ++---
src/tests/cmocka/test_dyndns.c | 7 +++----
src/tests/cmocka/test_negcache.c | 5 ++---
src/tests/cmocka/test_nested_groups.c | 4 ++--
src/tests/cmocka/test_nss_srv.c | 6 +++---
src/tests/common.h | 1 -
src/tests/common_dom.c | 1 -
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
07998b4034fb33195c99340e5544596925ecf145..f3029940d48e8fe72b25dfb66e3cf4a589a0960f
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
316ba5dee34afa208aa8718c0c1e36e19f1c318f..dcf6eede398ee5b3a71d5f81c932c856bc307929
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
605e27f04741449ffa8ada48a31b63358db34f6a..eff55b080bfac2014b75750b9f0b87813c3b3a1c
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
144eada1e031ecd96812804df51ea298f098e842..c79c8f02e5f0f9b11e8e046348b696c6348e63d5
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
359ae44669d0b004b45a6f42f514321d57cec077..56bd57bd10fe07fe8a6e89c4bfa902f821689e5e
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
ba3a50a719d17fe17c7e60663319c3699686709c..149356af41b498fe09f3331fe40a7a5db1a1f9e8
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
053b78ec363eef479843ef81c672bdc4449be0ba..514eaac7783aa1094aed94323d7b5dacb150c30d
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)
--
1.8.5.3
>From 6ce9775568e697ad81f56d2e8d671cf7afa23d62 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <[email protected]>
Date: Fri, 7 Mar 2014 13:50:13 +0100
Subject: [PATCH 2/5] TEST: Use right domain name in negcache test
Directory tests_ncache was not removed after negcache test,
because sysdb cache had different name and was not removed in the function
test_dom_suite_cleanup.
[sssd] [test_dom_suite_cleanup] (0x0020):
Could not delete the test dir (39) (Directory not empty)
---
src/tests/cmocka/test_negcache.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/tests/cmocka/test_negcache.c b/src/tests/cmocka/test_negcache.c
index
eff55b080bfac2014b75750b9f0b87813c3b3a1c..f078e0127ff42486f29c24bae953aa011a26be8c
100644
--- a/src/tests/cmocka/test_negcache.c
+++ b/src/tests/cmocka/test_negcache.c
@@ -333,7 +333,7 @@ static void test_sss_ncache_user(void **state)
ttl = LIFETIME;
ts = talloc_get_type_abort(*state, struct test_state);
dom = talloc(ts, struct sss_domain_info);
- dom->name = discard_const(NAME);
+ dom->name = discard_const_p(char, TEST_DOM_NAME);
/* test when domain name is not present in database */
dom->case_sensitive = false;
@@ -380,7 +380,7 @@ static void test_sss_ncache_group(void **state)
ttl = LIFETIME;
ts = talloc_get_type_abort(*state, struct test_state);
dom = talloc(ts, struct sss_domain_info);
- dom->name = discard_const(NAME);
+ dom->name = discard_const_p(char, TEST_DOM_NAME);
/* test when domain name is not present in database */
dom->case_sensitive = false;
@@ -427,7 +427,7 @@ static void test_sss_ncache_netgr(void **state)
ttl = LIFETIME;
ts = talloc_get_type_abort(*state, struct test_state);
dom = talloc(ts, struct sss_domain_info);
- dom->name = discard_const(NAME);
+ dom->name = discard_const_p(char, TEST_DOM_NAME);
/* test when domain name is not present in database */
dom->case_sensitive = false;
@@ -474,7 +474,7 @@ static void test_sss_ncache_service_name(void **state)
ttl = LIFETIME;
ts = talloc_get_type_abort(*state, struct test_state);
dom = talloc(ts, struct sss_domain_info);
- dom->name = discard_const(NAME);
+ dom->name = discard_const_p(char, TEST_DOM_NAME);
/* test when domain name and protocol are not present in database */
dom->case_sensitive = false;
@@ -520,7 +520,7 @@ static void test_sss_ncache_service_port(void **state)
ttl = LIFETIME;
ts = talloc_get_type_abort(*state, struct test_state);
dom = talloc(ts, struct sss_domain_info);
- dom->name = discard_const(NAME);
+ dom->name = discard_const_p(char, TEST_DOM_NAME);
/* test when domain name, port and protocol are not present in database */
dom->case_sensitive = false;
@@ -592,13 +592,13 @@ static void test_sss_ncache_prepopulate(void **state)
dom = talloc_zero(ts, struct sss_domain_info);
assert_non_null(dom);
- dom->name = discard_const(NAME);
+ dom->name = discard_const_p(char, TEST_DOM_NAME);
ts->nctx = mock_nctx(ts);
assert_non_null(ts->nctx);
tc = create_dom_test_ctx(ts, TESTS_PATH, TEST_CONF_DB,
- NAME, TEST_ID_PROVIDER, params);
+ TEST_DOM_NAME, TEST_ID_PROVIDER, params);
assert_non_null(tc);
ncache = ts->ctx;
--
1.8.5.3
>From 80b6063192d68ccdb79ce8585039d3eb3a1c5589 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <[email protected]>
Date: Sat, 8 Mar 2014 18:46:53 +0100
Subject: [PATCH 3/5] TEST: Do not clean up if test fail.
---
src/tests/cmocka/test_negcache.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/tests/cmocka/test_negcache.c b/src/tests/cmocka/test_negcache.c
index
f078e0127ff42486f29c24bae953aa011a26be8c..b51e390d57c8f02fc21d4cfa1aa81f6696196573
100644
--- a/src/tests/cmocka/test_negcache.c
+++ b/src/tests/cmocka/test_negcache.c
@@ -645,6 +645,8 @@ int main(void)
test_dom_suite_setup(TESTS_PATH);
rv = run_tests(tests);
- test_dom_suite_cleanup(TESTS_PATH, TEST_CONF_DB, TEST_SYSDB_FILE);
+ if (rv == 0) {
+ test_dom_suite_cleanup(TESTS_PATH, TEST_CONF_DB, TEST_SYSDB_FILE);
+ }
return rv;
}
--
1.8.5.3
>From a718f8e1d9b4c1ccafd44782350506568f3aa140 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <[email protected]>
Date: Sat, 8 Mar 2014 19:10:37 +0100
Subject: [PATCH 4/5] hbac-test: Use defined macros instead of strings
Macro HBAC_TEST_SRCHOSTGROUP2 was defined but it was not used anywhere.
---
src/tests/ipa_hbac-tests.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/tests/ipa_hbac-tests.c b/src/tests/ipa_hbac-tests.c
index
3c64fe044a2902622ae46b56687da920e8872c33..a1dd2fa411dc1ce8bd53bbe1c1283dce86c477db
100644
--- a/src/tests/ipa_hbac-tests.c
+++ b/src/tests/ipa_hbac-tests.c
@@ -164,16 +164,18 @@ static void get_test_srchost(TALLOC_CTX *mem_ctx,
new_srchost = talloc_zero(mem_ctx, struct hbac_request_element);
fail_if (new_srchost == NULL);
- new_srchost->name = talloc_strdup(new_srchost, "client.example.com");
+ new_srchost->name = talloc_strdup(new_srchost, HBAC_TEST_SRCHOST);
fail_if(new_srchost->name == NULL);
new_srchost->groups = talloc_array(new_srchost, const char *, 3);
fail_if(new_srchost->groups == NULL);
- new_srchost->groups[0] = talloc_strdup(new_srchost->groups, "site_hosts");
+ new_srchost->groups[0] = talloc_strdup(new_srchost->groups,
+ HBAC_TEST_SRCHOSTGROUP1);
fail_if(new_srchost->groups[0] == NULL);
- new_srchost->groups[1] = talloc_strdup(new_srchost->groups, "corp_hosts");
+ new_srchost->groups[1] = talloc_strdup(new_srchost->groups,
+ HBAC_TEST_SRCHOSTGROUP2);
fail_if(new_srchost->groups[1] == NULL);
new_srchost->groups[2] = NULL;
--
1.8.5.3
>From 88e1eefa44e3c7d26e8e073c7bcbbe7b73fecdf5 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <[email protected]>
Date: Sat, 8 Mar 2014 19:15:39 +0100
Subject: [PATCH 5/5] TESTS: Remove unused macros
---
src/tests/cmocka/test_negcache.c | 2 --
src/tests/cmocka/test_nested_groups.c | 1 -
src/tests/krb5_child-test.c | 7 -------
3 files changed, 10 deletions(-)
diff --git a/src/tests/cmocka/test_negcache.c b/src/tests/cmocka/test_negcache.c
index
b51e390d57c8f02fc21d4cfa1aa81f6696196573..b6bcb6b087c5c8b4d5f7699feaca3911e2fdc5d8
100644
--- a/src/tests/cmocka/test_negcache.c
+++ b/src/tests/cmocka/test_negcache.c
@@ -49,12 +49,10 @@
#define LIFETIME 200
#define SHORTSPAN 1
#define NAME "foo_name"
-#define UID "U-1-2-3-4-5"
#define TESTS_PATH "tests_ncache"
#define TEST_CONF_DB "test_nss_conf.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"
/* register_cli_protocol_version is required in test since it links with
diff --git a/src/tests/cmocka/test_nested_groups.c
b/src/tests/cmocka/test_nested_groups.c
index
c79c8f02e5f0f9b11e8e046348b696c6348e63d5..ed9a8c8ec8bef543f2a44d23451584de8fc8f2a5
100644
--- a/src/tests/cmocka/test_nested_groups.c
+++ b/src/tests/cmocka/test_nested_groups.c
@@ -44,7 +44,6 @@
* same tests cases for several search base scenarios */
#define OBJECT_BASE_DN "cn=objects,dc=test,dc=com"
#define GROUP_BASE_DN "cn=groups" OBJECT_BASE_DN
-#define USER_BASE_DN "cn=users" OBJECT_BASE_DN
struct nested_groups_test_ctx {
struct sss_test_ctx *tctx;
diff --git a/src/tests/krb5_child-test.c b/src/tests/krb5_child-test.c
index
8eb3b8608922b570665374be088f25add1a68e38..4046def65d39ffdc2c97b06c2d638150f3ca2f42
100644
--- a/src/tests/krb5_child-test.c
+++ b/src/tests/krb5_child-test.c
@@ -43,13 +43,6 @@ extern struct dp_option default_krb5_opts[];
static krb5_context krb5_error_ctx;
#define KRB5_CHILD_TEST_DEBUG(level, error) KRB5_DEBUG(level, krb5_error_ctx,
error)
-#define CHECK_KRET(kret, err) do { \
- if (kret) { \
- KRB5_CHILD_TEST_DEBUG(SSSDBG_OP_FAILURE, kret); \
- return err; \
- } \
-} while(0) \
-
#define CHECK_KRET_L(kret, err, label) do { \
if (kret) { \
KRB5_CHILD_TEST_DEBUG(SSSDBG_OP_FAILURE, kret); \
--
1.8.5.3
_______________________________________________
sssd-devel mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
