summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2015-09-16 15:31:02 +0200
committerJakub Hrozek <jhrozek@redhat.com>2015-09-22 13:45:56 +0200
commitcffe3defa3cb5011efc92a7773fe113a1e69774f (patch)
treeb17aaee6ae4a42d2d6ec9c2ed83564c0be920237
parent67625b1b4f856510bf4e169649b3fb30c2c14152 (diff)
downloadsssd-cffe3defa3cb5011efc92a7773fe113a1e69774f.tar.gz
sssd-cffe3defa3cb5011efc92a7773fe113a1e69774f.tar.xz
sssd-cffe3defa3cb5011efc92a7773fe113a1e69774f.zip
tests: Move named_domain from test_utils to common test code
This handy function should be reused by other parts of the code. Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
-rw-r--r--src/tests/cmocka/test_data_provider_be.c17
-rw-r--r--src/tests/cmocka/test_utils.c17
-rw-r--r--src/tests/common.h4
-rw-r--r--src/tests/common_dom.c22
4 files changed, 26 insertions, 34 deletions
diff --git a/src/tests/cmocka/test_data_provider_be.c b/src/tests/cmocka/test_data_provider_be.c
index 68eb5841b..52d65076c 100644
--- a/src/tests/cmocka/test_data_provider_be.c
+++ b/src/tests/cmocka/test_data_provider_be.c
@@ -66,23 +66,6 @@ struct test_ctx {
struct be_ctx *be_ctx;
};
-static struct sss_domain_info *named_domain(TALLOC_CTX *mem_ctx,
- const char *name,
- struct sss_domain_info *parent)
-{
- struct sss_domain_info *dom = NULL;
-
- dom = talloc_zero(mem_ctx, struct sss_domain_info);
- assert_non_null(dom);
-
- dom->name = talloc_strdup(dom, name);
- assert_non_null(dom->name);
-
- dom->parent = parent;
-
- return dom;
-}
-
static int test_setup(void **state)
{
struct test_ctx *test_ctx = NULL;
diff --git a/src/tests/cmocka/test_utils.c b/src/tests/cmocka/test_utils.c
index a22c39c47..cab168437 100644
--- a/src/tests/cmocka/test_utils.c
+++ b/src/tests/cmocka/test_utils.c
@@ -454,23 +454,6 @@ void test_find_domain_by_sid_disabled(void **state)
}
}
-static struct sss_domain_info *named_domain(TALLOC_CTX *mem_ctx,
- const char *name,
- struct sss_domain_info *parent)
-{
- struct sss_domain_info *dom = NULL;
-
- dom = talloc_zero(mem_ctx, struct sss_domain_info);
- assert_non_null(dom);
-
- dom->name = talloc_strdup(dom, name);
- assert_non_null(dom->name);
-
- dom->parent = parent;
-
- return dom;
-}
-
/*
* dom1 -> sub1a
* |
diff --git a/src/tests/common.h b/src/tests/common.h
index 1c6de2c3d..c0ceebfbf 100644
--- a/src/tests/common.h
+++ b/src/tests/common.h
@@ -134,4 +134,8 @@ test_dbus_call_sync(DBusConnection *conn,
int first_arg_type,
...);
+struct sss_domain_info *named_domain(TALLOC_CTX *mem_ctx,
+ const char *name,
+ struct sss_domain_info *parent);
+
#endif /* !__TESTS_COMMON_H__ */
diff --git a/src/tests/common_dom.c b/src/tests/common_dom.c
index 46ea0b782..24d1f5a8a 100644
--- a/src/tests/common_dom.c
+++ b/src/tests/common_dom.c
@@ -371,3 +371,25 @@ void test_dom_suite_cleanup(const char *tests_path,
test_multidom_suite_cleanup(tests_path, cdb_file, domains);
}
+
+struct sss_domain_info *named_domain(TALLOC_CTX *mem_ctx,
+ const char *name,
+ struct sss_domain_info *parent)
+{
+ struct sss_domain_info *dom = NULL;
+
+ dom = talloc_zero(mem_ctx, struct sss_domain_info);
+ if (dom == NULL) {
+ return NULL;
+ }
+
+ dom->name = talloc_strdup(dom, name);
+ if (dom->name == NULL) {
+ talloc_free(dom);
+ return NULL;
+ }
+
+ dom->parent = parent;
+
+ return dom;
+}