Hello, I noticed a small discrepancy, so I fixed it. There was duplication of mock function in our tests.
Simple patch is attached. Regards -- Petr^4 Čech
>From 1d678d30330d326c75b6b6ac5fe0d8b652804e0e Mon Sep 17 00:00:00 2001 From: Petr Cech <[email protected]> Date: Wed, 4 May 2016 05:44:35 -0400 Subject: [PATCH] TEST: Removing duplication of mock_rctx There were duplicaton of mock_rctx(). Resolves: https://fedorahosted.org/sssd/ticket/2928 --- Makefile.am | 1 + src/tests/cmocka/test_negcache.c | 28 ---------------------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9144274c787a9a1fd8bef72e7ac6e68a1a28a0e3..7161bef3c9b47db92a390220e3f285c7b5d2d812 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2029,6 +2029,7 @@ EXTRA_test_negcache_DEPENDENCIES = \ $(ldblib_LTLIBRARIES) test_negcache_SOURCES = \ $(SSSD_RESPONDER_OBJ) \ + src/tests/cmocka/common_mock_resp.c \ src/tests/cmocka/test_negcache.c test_negcache_CFLAGS = \ $(AM_CFLAGS) \ diff --git a/src/tests/cmocka/test_negcache.c b/src/tests/cmocka/test_negcache.c index 709bb21d64e48cf58f84bb58b20b36a5da9be283..99d61fbc646e86de8fdb775dce3e062ce5b66b8a 100644 --- a/src/tests/cmocka/test_negcache.c +++ b/src/tests/cmocka/test_negcache.c @@ -96,34 +96,6 @@ mock_nctx(TALLOC_CTX *mem_ctx) return nctx; } -/* responder context is duplicated here because linking - * with common_mock_resp.c would get us duplicates - */ - -struct resp_ctx * -mock_rctx(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, - struct sss_domain_info *domains, - void *pvt_ctx) -{ - struct resp_ctx *rctx; - errno_t ret; - - rctx = talloc_zero(mem_ctx, struct resp_ctx); - if (!rctx) return NULL; - - ret = sss_hash_create(rctx, 30, &rctx->dp_request_table); - if (ret != EOK) { - talloc_free(rctx); - return NULL; - } - - rctx->ev = ev; - rctx->domains = domains; - rctx->pvt_ctx = pvt_ctx; - return rctx; -} - struct test_state { struct sss_nc_ctx *ctx; struct nss_ctx *nctx; -- 2.5.5
_______________________________________________ sssd-devel mailing list [email protected] https://lists.fedorahosted.org/admin/lists/[email protected]
