>From a9fc37690be71db3146559bc30f3000fba1ddd78 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Tue, 6 Jan 2015 16:32:16 +0100 Subject: [PATCH 1/2] TESTS: Mock return value of sdap_get_generic_recv --- src/tests/cmocka/common_mock_sdap.c | 2 +- src/tests/cmocka/test_nested_groups.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/tests/cmocka/common_mock_sdap.c b/src/tests/cmocka/common_mock_sdap.c index b2b57cbd23c9a9882cca38e63ea0b021546880e5..4f6988c2619f5a0f4e49a629f2a3bf5b792fd2a5 100644 --- a/src/tests/cmocka/common_mock_sdap.c +++ b/src/tests/cmocka/common_mock_sdap.c @@ -100,7 +100,7 @@ int sdap_get_generic_recv(struct tevent_req *req, *reply_count = sss_mock_type(size_t); *reply = sss_mock_ptr_type(struct sysdb_attrs **); - return EOK; + return sss_mock_type(int); } struct tevent_req * sdap_deref_search_send(TALLOC_CTX *mem_ctx, diff --git a/src/tests/cmocka/test_nested_groups.c b/src/tests/cmocka/test_nested_groups.c index 69033130f899e6f2bf16a04813654fc5f3e529ef..c4ecb874e42e6fa53b97d2f2c520940ef31b41cf 100644 --- a/src/tests/cmocka/test_nested_groups.c +++ b/src/tests/cmocka/test_nested_groups.c @@ -177,11 +177,13 @@ static void nested_groups_test_one_group_unique_members(void **state) assert_non_null(user1_reply[0]); will_return(sdap_get_generic_recv, 1); will_return(sdap_get_generic_recv, user1_reply); + will_return(sdap_get_generic_recv, ERR_OK); user2_reply[0] = mock_sysdb_user(test_ctx, USER_BASE_DN, 2002, "user2"); assert_non_null(user2_reply[0]); will_return(sdap_get_generic_recv, 1); will_return(sdap_get_generic_recv, user2_reply); + will_return(sdap_get_generic_recv, ERR_OK); sss_will_return_always(sdap_has_deref_support, false); @@ -235,11 +237,13 @@ static void nested_groups_test_one_group_dup_users(void **state) assert_non_null(user1_reply[0]); will_return(sdap_get_generic_recv, 1); will_return(sdap_get_generic_recv, user1_reply); + will_return(sdap_get_generic_recv, ERR_OK); user2_reply[0] = mock_sysdb_user(test_ctx, USER_BASE_DN, 2001, "user1"); assert_non_null(user2_reply[0]); will_return(sdap_get_generic_recv, 1); will_return(sdap_get_generic_recv, user2_reply); + will_return(sdap_get_generic_recv, ERR_OK); sss_will_return_always(sdap_has_deref_support, false); @@ -297,12 +301,14 @@ static void nested_groups_test_one_group_unique_group_members(void **state) assert_non_null(group1_reply[0]); will_return(sdap_get_generic_recv, 1); will_return(sdap_get_generic_recv, group1_reply); + will_return(sdap_get_generic_recv, ERR_OK); group2_reply[0] = mock_sysdb_group_rfc2307bis(test_ctx, GROUP_BASE_DN, 1002, "emptygroup2", NULL); assert_non_null(group2_reply[0]); will_return(sdap_get_generic_recv, 1); will_return(sdap_get_generic_recv, group2_reply); + will_return(sdap_get_generic_recv, ERR_OK); sss_will_return_always(sdap_has_deref_support, false); @@ -358,12 +364,14 @@ static void nested_groups_test_one_group_dup_group_members(void **state) assert_non_null(group1_reply[0]); will_return(sdap_get_generic_recv, 1); will_return(sdap_get_generic_recv, group1_reply); + will_return(sdap_get_generic_recv, ERR_OK); group2_reply[0] = mock_sysdb_group_rfc2307bis(test_ctx, GROUP_BASE_DN, 1001, "emptygroup1", NULL); assert_non_null(group2_reply[0]); will_return(sdap_get_generic_recv, 1); will_return(sdap_get_generic_recv, group2_reply); + will_return(sdap_get_generic_recv, ERR_OK); sss_will_return_always(sdap_has_deref_support, false); -- 2.1.0