Skip to content

Commit 58910fb

Browse files
claudeclaude
committed
TEST: replace deprecated cmocka macros in test_nss_srv.c
Replace will_return_always with will_return_uint_always, will_return_count with will_return_uint_count, and assert_in_range with assert_uint_in_range. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent c44dc20 commit 58910fb

File tree

1 file changed

+33
-33
lines changed

1 file changed

+33
-33
lines changed

‎src/tests/cmocka/test_nss_srv.c‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,7 +1525,7 @@ void test_sss_nss_getgrnam_no_members(void **state)
15251525

15261526
mock_input_user_or_group(getgrnam_no_members.gr_name);
15271527
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETGRNAM);
1528-
will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
1528+
will_return_uint_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
15291529

15301530
/* Query for that group, call a callback when command finishes */
15311531
set_cmd_cb(test_sss_nss_getgrnam_no_members_check);
@@ -1627,7 +1627,7 @@ void test_sss_nss_getgrnam_members(void **state)
16271627

16281628
mock_input_user_or_group("testgroup_members");
16291629
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETGRNAM);
1630-
will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
1630+
will_return_uint_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
16311631

16321632
/* Query for that group, call a callback when command finishes */
16331633
set_cmd_cb(test_sss_nss_getgrnam_members_check);
@@ -1694,7 +1694,7 @@ void test_sss_nss_getgrnam_members_fqdn(void **state)
16941694

16951695
mock_input_user_or_group("testgroup_members@"TEST_DOM_NAME);
16961696
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETGRNAM);
1697-
will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
1697+
will_return_uint_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
16981698

16991699
/* Query for that group, call a callback when command finishes */
17001700
set_cmd_cb(test_sss_nss_getgrnam_members_check_fqdn);
@@ -1795,7 +1795,7 @@ void test_sss_nss_getgrnam_members_subdom(void **state)
17951795

17961796
mock_input_user_or_group("testsubdomgroup@"TEST_SUBDOM_NAME);
17971797
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETGRNAM);
1798-
will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
1798+
will_return_uint_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
17991799

18001800
/* Query for that group, call a callback when command finishes */
18011801
set_cmd_cb(test_sss_nss_getgrnam_members_check_subdom);
@@ -1816,7 +1816,7 @@ void test_sss_nss_getgrnam_members_subdom_nonfqnames(void **state)
18161816
mock_input_user_or_group("testsubdomgroup");
18171817
mock_account_recv_simple();
18181818
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETGRNAM);
1819-
will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
1819+
will_return_uint_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
18201820

18211821
/* Query for that group, call a callback when command finishes */
18221822
set_cmd_cb(test_sss_nss_getgrnam_members_check_subdom);
@@ -1883,7 +1883,7 @@ void test_sss_nss_getgrnam_mix_dom(void **state)
18831883

18841884
mock_input_user_or_group("testgroup_members");
18851885
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETGRNAM);
1886-
will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
1886+
will_return_uint_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
18871887

18881888
/* Query for that group, call a callback when command finishes */
18891889
set_cmd_cb(test_sss_nss_getgrnam_check_mix_dom);
@@ -1910,7 +1910,7 @@ void test_sss_nss_getgrnam_mix_dom_nonfqnames(void **state)
19101910

19111911
mock_input_user_or_group("testgroup_members");
19121912
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETGRNAM);
1913-
will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
1913+
will_return_uint_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
19141914

19151915
/* Query for that group, call a callback when command finishes */
19161916
set_cmd_cb(test_sss_nss_getgrnam_check_mix_dom);
@@ -1994,7 +1994,7 @@ void test_sss_nss_getgrnam_mix_dom_fqdn(void **state)
19941994

19951995
mock_input_user_or_group("testgroup_members@"TEST_DOM_NAME);
19961996
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETGRNAM);
1997-
will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
1997+
will_return_uint_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
19981998

19991999
/* Query for that group, call a callback when command finishes */
20002000
set_cmd_cb(test_sss_nss_getgrnam_check_mix_dom_fqdn);
@@ -2025,7 +2025,7 @@ void test_sss_nss_getgrnam_mix_dom_fqdn_nonfqnames(void **state)
20252025

20262026
mock_input_user_or_group("testgroup_members");
20272027
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETGRNAM);
2028-
will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
2028+
will_return_uint_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
20292029

20302030
/* Query for that group, call a callback when command finishes */
20312031
set_cmd_cb(test_sss_nss_getgrnam_check_mix_dom_fqdn);
@@ -2108,7 +2108,7 @@ void test_sss_nss_getgrnam_mix_subdom(void **state)
21082108

21092109
mock_input_user_or_group("testsubdomgroup@"TEST_SUBDOM_NAME);
21102110
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETGRNAM);
2111-
will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
2111+
will_return_uint_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
21122112

21132113
/* Query for that group, call a callback when command finishes */
21142114
set_cmd_cb(test_sss_nss_getgrnam_check_mix_subdom);
@@ -2136,7 +2136,7 @@ void test_sss_nss_getgrnam_mix_subdom_nonfqnames(void **state)
21362136
mock_input_user_or_group("testsubdomgroup");
21372137
mock_account_recv_simple();
21382138
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETGRNAM);
2139-
will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
2139+
will_return_uint_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
21402140

21412141
/* Query for that group, call a callback when command finishes */
21422142
set_cmd_cb(test_sss_nss_getgrnam_check_mix_subdom);
@@ -2189,7 +2189,7 @@ void test_sss_nss_getgrnam_space(void **state)
21892189

21902190
mock_input_user_or_group("space group");
21912191
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETGRNAM);
2192-
will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
2192+
will_return_uint_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
21932193

21942194
/* Query for that group, call a callback when command finishes */
21952195
set_cmd_cb(test_sss_nss_getgrnam_space_check);
@@ -2234,7 +2234,7 @@ void test_sss_nss_getgrnam_space_sub(void **state)
22342234

22352235
mock_input_user_or_group("space group");
22362236
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETGRNAM);
2237-
will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
2237+
will_return_uint_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
22382238

22392239
/* Query for that group, call a callback when command finishes */
22402240
set_cmd_cb(test_sss_nss_getgrnam_space_sub_check);
@@ -2342,7 +2342,7 @@ void test_sss_nss_well_known_getidbysid_failure(void **state)
23422342
will_return(__wrap_sss_packet_get_body, WRAP_CALL_WRAPPER);
23432343
will_return(__wrap_sss_packet_get_body, "S-1-5-32-550");
23442344
will_return(__wrap_sss_packet_get_body, 0);
2345-
will_return_always(__wrap_sss_packet_get_cmd, SSS_NSS_GETIDBYSID);
2345+
will_return_uint_always(__wrap_sss_packet_get_cmd, SSS_NSS_GETIDBYSID);
23462346
will_return(test_sss_nss_well_known_sid_check, NULL);
23472347

23482348
set_cmd_cb(test_sss_nss_well_known_sid_check);
@@ -3203,7 +3203,7 @@ void test_sss_nss_initgroups(void **state)
32033203

32043204
mock_input_user_or_group("testinitgr");
32053205
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_INITGR);
3206-
will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
3206+
will_return_uint_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
32073207

32083208
/* Query for that user, call a callback when command finishes */
32093209
set_cmd_cb(test_sss_nss_initgr_check);
@@ -3356,7 +3356,7 @@ void test_sss_nss_initgr_search(void **state)
33563356
mock_input_user_or_group("testinitgr_srch");
33573357
mock_account_recv(0, 0, NULL, test_sss_nss_initgr_search_acct_cb, sss_nss_test_ctx);
33583358
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_INITGR);
3359-
will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
3359+
will_return_uint_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
33603360
set_cmd_cb(test_sss_nss_initgr_search_check);
33613361

33623362
ret = get_user(sss_nss_test_ctx, sss_nss_test_ctx->tctx->dom,
@@ -3476,7 +3476,7 @@ void test_sss_nss_initgr_update(void **state)
34763476
mock_input_user_or_group("testinitgr_update");
34773477
mock_account_recv(0, 0, NULL, test_sss_nss_initgr_update_acct_cb, sss_nss_test_ctx);
34783478
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_INITGR);
3479-
will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
3479+
will_return_uint_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
34803480
set_cmd_cb(test_sss_nss_initgr_update_check);
34813481

34823482
/* Query for that user, call a callback when command finishes */
@@ -3598,7 +3598,7 @@ void test_sss_nss_initgr_update_two_expire_attributes(void **state)
35983598
test_sss_nss_initgr_update_acct_2expire_attributes_cb,
35993599
sss_nss_test_ctx);
36003600
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_INITGR);
3601-
will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
3601+
will_return_uint_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
36023602
set_cmd_cb(test_sss_nss_initgr_update_2expire_attributes_check);
36033603

36043604
/* Query for that user, call a callback when command finishes */
@@ -3617,7 +3617,7 @@ void test_sss_nss_initgroups_upn(void **state)
36173617

36183618
mock_input_upn("upninitgr@upndomain.test");
36193619
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_INITGR);
3620-
will_return_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
3620+
will_return_uint_always(__wrap_sss_packet_get_body, WRAP_CALL_REAL);
36213621

36223622
/* Query for that user, call a callback when command finishes */
36233623
set_cmd_cb(test_sss_nss_initgr_check);
@@ -4113,7 +4113,7 @@ static int test_sss_nss_getlistbycert_check_exp(uint32_t status, uint8_t *body,
41134113
} else if (strcmp(name, fq_name2) == 0) {
41144114
found = 2;
41154115
}
4116-
assert_in_range(found, 1, 2);
4116+
assert_uint_in_range(found, 1, 2);
41174117

41184118
SAFEALIGN_COPY_UINT32(&id_type, body + rp, &rp);
41194119
assert_int_equal(id_type, SSS_ID_TYPE_UID);
@@ -5539,7 +5539,7 @@ void test_sss_nss_gethostbyname(void **state)
55395539
mock_input_hostbyname("testhost");
55405540
mock_resolver_recv_simple();
55415541
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETHOSTBYNAME);
5542-
will_return_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 9);
5542+
will_return_uint_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 9);
55435543

55445544
/* Query for that host, call a callback when command finishes */
55455545
set_cmd_cb(test_sss_nss_gethostbyname_check);
@@ -5557,7 +5557,7 @@ void test_sss_nss_gethostbyname(void **state)
55575557
mock_input_hostbyname("testhost_alias1");
55585558
mock_resolver_recv_simple();
55595559
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETHOSTBYNAME);
5560-
will_return_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 9);
5560+
will_return_uint_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 9);
55615561

55625562
set_cmd_cb(test_sss_nss_gethostbyname_check);
55635563
ret = sss_cmd_execute(sss_nss_test_ctx->cctx, SSS_NSS_GETHOSTBYNAME,
@@ -5574,7 +5574,7 @@ void test_sss_nss_gethostbyname(void **state)
55745574
mock_input_hostbyname("testhost_alias2");
55755575
mock_resolver_recv_simple();
55765576
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETHOSTBYNAME);
5577-
will_return_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 9);
5577+
will_return_uint_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 9);
55785578

55795579
set_cmd_cb(test_sss_nss_gethostbyname_check);
55805580
ret = sss_cmd_execute(sss_nss_test_ctx->cctx, SSS_NSS_GETHOSTBYNAME,
@@ -5591,7 +5591,7 @@ void test_sss_nss_gethostbyname(void **state)
55915591
mock_input_hostbyname("testhost_alias3");
55925592
mock_resolver_recv_simple();
55935593
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETHOSTBYNAME);
5594-
will_return_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 9);
5594+
will_return_uint_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 9);
55955595

55965596
set_cmd_cb(test_sss_nss_gethostbyname_check);
55975597
ret = sss_cmd_execute(sss_nss_test_ctx->cctx, SSS_NSS_GETHOSTBYNAME,
@@ -5639,7 +5639,7 @@ void test_sss_nss_gethostbyaddr(void **state)
56395639
mock_input_netaddr(sss_nss_test_ctx, AF_INET, "1.2.3.4");
56405640
mock_resolver_recv_simple();
56415641
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETHOSTBYADDR);
5642-
will_return_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 9);
5642+
will_return_uint_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 9);
56435643

56445644
/* Query for that host, call a callback when command finishes */
56455645
set_cmd_cb(test_sss_nss_gethostbyname_check);
@@ -5657,7 +5657,7 @@ void test_sss_nss_gethostbyaddr(void **state)
56575657
mock_input_netaddr(sss_nss_test_ctx, AF_INET, "9.8.7.6");
56585658
mock_resolver_recv_simple();
56595659
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETHOSTBYADDR);
5660-
will_return_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 9);
5660+
will_return_uint_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 9);
56615661

56625662
/* Query for that host, call a callback when command finishes */
56635663
set_cmd_cb(test_sss_nss_gethostbyname_check);
@@ -5675,7 +5675,7 @@ void test_sss_nss_gethostbyaddr(void **state)
56755675
mock_input_netaddr(sss_nss_test_ctx, AF_INET6, "2001:DB8:1234:0::0000");
56765676
mock_resolver_recv_simple();
56775677
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETHOSTBYADDR);
5678-
will_return_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 9);
5678+
will_return_uint_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 9);
56795679

56805680
/* Query for that host, call a callback when command finishes */
56815681
set_cmd_cb(test_sss_nss_gethostbyaddr_v6_check);
@@ -5693,7 +5693,7 @@ void test_sss_nss_gethostbyaddr(void **state)
56935693
mock_input_netaddr(sss_nss_test_ctx, AF_INET6, "2001:DB8:0000::1234");
56945694
mock_resolver_recv_simple();
56955695
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETHOSTBYADDR);
5696-
will_return_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 9);
5696+
will_return_uint_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 9);
56975697

56985698
/* Query for that host, call a callback when command finishes */
56995699
set_cmd_cb(test_sss_nss_gethostbyaddr_v6_check);
@@ -5862,7 +5862,7 @@ void test_sss_nss_getnetbyname(void **state)
58625862
mock_input_netbyname("test_network");
58635863
mock_resolver_recv_simple();
58645864
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETNETBYNAME);
5865-
will_return_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 5);
5865+
will_return_uint_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 5);
58665866

58675867
/* Query for that network, call a callback when command finishes */
58685868
set_cmd_cb(test_sss_nss_getnetbyname_check);
@@ -5880,7 +5880,7 @@ void test_sss_nss_getnetbyname(void **state)
58805880
mock_input_netbyname("test_network_alias1");
58815881
mock_resolver_recv_simple();
58825882
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETNETBYNAME);
5883-
will_return_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 5);
5883+
will_return_uint_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 5);
58845884

58855885
set_cmd_cb(test_sss_nss_getnetbyname_check);
58865886
ret = sss_cmd_execute(sss_nss_test_ctx->cctx, SSS_NSS_GETNETBYNAME,
@@ -5897,7 +5897,7 @@ void test_sss_nss_getnetbyname(void **state)
58975897
mock_input_netbyname("test_network_alias2");
58985898
mock_resolver_recv_simple();
58995899
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETNETBYNAME);
5900-
will_return_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 5);
5900+
will_return_uint_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 5);
59015901

59025902
set_cmd_cb(test_sss_nss_getnetbyname_check);
59035903
ret = sss_cmd_execute(sss_nss_test_ctx->cctx, SSS_NSS_GETNETBYNAME,
@@ -5914,7 +5914,7 @@ void test_sss_nss_getnetbyname(void **state)
59145914
mock_input_netbyname("test_network_alias3");
59155915
mock_resolver_recv_simple();
59165916
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETNETBYNAME);
5917-
will_return_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 5);
5917+
will_return_uint_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 5);
59185918

59195919
set_cmd_cb(test_sss_nss_getnetbyname_check);
59205920
ret = sss_cmd_execute(sss_nss_test_ctx->cctx, SSS_NSS_GETNETBYNAME,
@@ -5933,7 +5933,7 @@ void test_sss_nss_getnetbyaddr(void **state)
59335933
mock_input_netaddr(sss_nss_test_ctx, AF_INET, "1.2.3.4");
59345934
mock_resolver_recv_simple();
59355935
will_return(__wrap_sss_packet_get_cmd, SSS_NSS_GETNETBYADDR);
5936-
will_return_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 5);
5936+
will_return_uint_count(__wrap_sss_packet_get_body, WRAP_CALL_REAL, 5);
59375937

59385938
/* Query for that network, call a callback when command finishes */
59395939
set_cmd_cb(test_sss_nss_getnetbyname_check);

0 commit comments

Comments
 (0)