From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from glass.ash.relay.mailchannels.net (glass.ash.relay.mailchannels.net [23.83.222.70]) by sourceware.org (Postfix) with ESMTPS id AECA13858C52 for ; Fri, 23 Sep 2022 13:34:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AECA13858C52 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gotplt.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id B05322A230E; Fri, 23 Sep 2022 13:33:57 +0000 (UTC) Received: from pdx1-sub0-mail-a304 (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 28EB12A1400; Fri, 23 Sep 2022 13:33:57 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1663940037; a=rsa-sha256; cv=none; b=rCiJUby08FeVBUWiW/NcPqNytDl7bcxggslAbTUc+7ktApSEyQeAgdGfLRppbEepRGG05H 3xUATLypR1PXh8GnTEep6fl/SxUrbsA97faEjf9Bv0dY300A34jTAUZ2rHPuGse7uF42uI bYqhlha1OLH75prdiZexqKZYgXlyKBXhD/tcBNmXAiprx8zk7GGXzNvUe3BdzOOeFuF27l eDDiAzfhedGarTwc5+fDYZ0j0WkOXJj6v1SLdhxjLbWi2F0lKB5V9h/C7HKuGcCpxYqe5L aFj0oIe1PtcENCG+Zc3GUTGZEK3K9qnlyfVhKo04wnNa2PJTRolapMiKHwaKLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1663940037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pX950FI2raKQ2YHw0j8MIRvVD2BOg0s7wbzaRgbVwoc=; b=9DlqSkoo1WgIX4fsM9140eeR+T+e6h4c3ahaZPT3uovwL5lMcsQ6opA2Of57iPNYXbeHqn SKpp8Xsi5ep/yUyh9if7BJwV+PEkZ+XEZv3nPF8+XLYL1TaVRZ9vWT+cyk7U3BHEkFHTZB 34reE8VawxeAY0EB20p1bdJS2qybzY9/wAta2F6c79QDWgLBhnBJIigtns3GbJP3t2/cOd v3kuzMTV3Aur7iY7P6yw7lQj7y28MJQSadSHr6EwD3i6HHCnBLRzFD0yt2kfMnf0rn64Rv ExOL0H2okGHA1LlXWbfpx34g492we+zrZhOqgWAVMh7eTxicdvQM0VYMFSB3qg== ARC-Authentication-Results: i=1; rspamd-64f49dbfc4-xdwjn; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Celery-Imminent: 43838f7739edf0a4_1663940037522_1148402877 X-MC-Loop-Signature: 1663940037522:1321024692 X-MC-Ingress-Time: 1663940037522 Received: from pdx1-sub0-mail-a304 (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.121.28.240 (trex/6.7.1); Fri, 23 Sep 2022 13:33:57 +0000 Received: from [192.168.0.182] (bras-vprn-toroon4834w-lp130-16-184-147-84-238.dsl.bell.ca [184.147.84.238]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a304 (Postfix) with ESMTPSA id 4MYtQr2x3mzVF; Fri, 23 Sep 2022 06:33:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gotplt.org; s=dreamhost; t=1663940036; bh=pX950FI2raKQ2YHw0j8MIRvVD2BOg0s7wbzaRgbVwoc=; h=Date:Subject:To:From:Content-Type:Content-Transfer-Encoding; b=LImcmh/8yeQ6ynU9eFIXkiGiQNmCexoN6E+yq0L349Co7eArd1dFX2EuD5UVvO2vQ YPX9S6JU54FFEyO7ZTHhP1RD/RBS8Lv4kpdkONnDquLxewS5c1x0nW5tSYZr8tTzWE woXmqugdF95rgN4I7rjXO1/EEplqFgl0HeQV+SriAfL4JSAP9ivFB3z0VJRHkNfBJK J96wfYgeosgzQ73vv6wAP+MY+HJOn5FB4bs3X4/rejK4fbzQmqyuCkN7Wn3vSILQTA emSNy3miqOccYcNdtzsIXRlAIdQiEJkOn6jlxIDmGHp1tuxE6RvF+9n3MZeUmFOxF4 /lpt6As/GDRMQ== Message-ID: Date: Fri, 23 Sep 2022 09:33:54 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Subject: Re: [PATCH 1/2] nss: Enhance tst-reload1 coverage and logging Content-Language: en-US To: Florian Weimer , libc-alpha@sourceware.org References: <0e287934ef500ec39ac8610dde04f2ea4a9d4010.1663931559.git.fweimer@redhat.com> From: Siddhesh Poyarekar In-Reply-To: <0e287934ef500ec39ac8610dde04f2ea4a9d4010.1663931559.git.fweimer@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3037.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 2022-09-23 07:13, Florian Weimer via Libc-alpha wrote: > --- > nss/tst-reload1.c | 51 +++++++++++++++++++++++++++-------------------- > 1 file changed, 29 insertions(+), 22 deletions(-) LGTM. Reviewed-by: Siddhesh Poyarekar > > diff --git a/nss/tst-reload1.c b/nss/tst-reload1.c > index fdc5bdd65b..9cc6115c96 100644 > --- a/nss/tst-reload1.c > +++ b/nss/tst-reload1.c > @@ -121,7 +121,7 @@ must_be_tests (struct passwd *pt, struct hostent *ht) > TEST_VERIFY (p != NULL); > if (p != NULL) > { > - TEST_VERIFY (strcmp (p->pw_name, pt[i].pw_name) == 0); > + TEST_COMPARE_STRING (p->pw_name, pt[i].pw_name); > } > } > > @@ -132,8 +132,8 @@ must_be_tests (struct passwd *pt, struct hostent *ht) > TEST_VERIFY (p != NULL); > if (p != NULL) > { > - TEST_VERIFY (strcmp (p->pw_name, pt[i].pw_name) == 0); > - TEST_VERIFY (p->pw_uid == pt[i].pw_uid); > + TEST_COMPARE_STRING (p->pw_name, pt[i].pw_name); > + TEST_COMPARE (p->pw_uid, pt[i].pw_uid); > } > } > endpwent (); > @@ -144,10 +144,12 @@ must_be_tests (struct passwd *pt, struct hostent *ht) > TEST_VERIFY (h != NULL); > if (h != NULL) > { > - TEST_VERIFY (strcmp (h->h_name, ht[i].h_name) == 0); > + TEST_COMPARE_STRING (h->h_name, ht[i].h_name); > + TEST_COMPARE (h->h_addrtype, AF_INET); > TEST_VERIFY (h->h_addr_list[0] != NULL); > - if (h->h_addr_list[0]) > - TEST_VERIFY (strcmp (h->h_addr_list[0], ht[i].h_addr_list[0]) == 0); > + if (h->h_addr_list[0] != NULL) > + TEST_COMPARE_BLOB (h->h_addr_list[0], h->h_length, > + ht[i].h_addr_list[0], ht[i].h_length); > } > } > > @@ -158,14 +160,16 @@ must_be_tests (struct passwd *pt, struct hostent *ht) > int herrno, res; > > res = gethostbyname2_r (ht[i].h_name, AF_INET, > - &r, buf, TESTBUFLEN, &rp, &herrno); > - TEST_VERIFY (res == 0); > + &r, buf, TESTBUFLEN, &rp, &herrno); > + TEST_COMPARE (res, 0); > if (res == 0) > { > - TEST_VERIFY (strcmp (r.h_name, ht[i].h_name) == 0); > + TEST_COMPARE_STRING (r.h_name, ht[i].h_name); > + TEST_COMPARE (r.h_addrtype, AF_INET); > TEST_VERIFY (r.h_addr_list[0] != NULL); > - if (r.h_addr_list[0]) > - TEST_VERIFY (strcmp (r.h_addr_list[0], ht[i].h_addr_list[0]) == 0); > + if (r.h_addr_list[0] != NULL) > + TEST_COMPARE_BLOB (r.h_addr_list[0], r.h_length, > + ht[i].h_addr_list[0], ht[i].h_length); > } > } > > @@ -175,10 +179,11 @@ must_be_tests (struct passwd *pt, struct hostent *ht) > TEST_VERIFY (h != NULL); > if (h != NULL) > { > - TEST_VERIFY (strcmp (h->h_name, ht[i].h_name) == 0); > + TEST_COMPARE_STRING (h->h_name, ht[i].h_name); > TEST_VERIFY (h->h_addr_list[0] != NULL); > - if (h->h_addr_list[0]) > - TEST_VERIFY (strcmp (h->h_addr_list[0], ht[i].h_addr_list[0]) == 0); > + if (h->h_addr_list[0] != NULL) > + TEST_COMPARE_BLOB (h->h_addr_list[0], h->h_length, > + ht[i].h_addr_list[0], ht[i].h_length); > } > } > > @@ -198,17 +203,19 @@ must_be_tests (struct passwd *pt, struct hostent *ht) > > ap = NULL; > res = getaddrinfo (ht[i].h_name, NULL, &hint, &ap); > - TEST_VERIFY (res == 0); > + TEST_COMPARE (res, 0); > TEST_VERIFY (ap != NULL); > if (res == 0 && ap != NULL) > { > j = 0; /* which address in the list */ > while (ap) > { > + TEST_COMPARE (ap->ai_family, AF_INET); > + > struct sockaddr_in *in = (struct sockaddr_in *)ap->ai_addr; > unsigned char *up = (unsigned char *)&in->sin_addr; > > - TEST_VERIFY (memcmp (up, ht[i].h_addr_list[j], 4) == 0); > + TEST_COMPARE_BLOB (up, 4, ht[i].h_addr_list[j], 4); > > ap = ap->ai_next; > ++j; > @@ -233,7 +240,7 @@ must_be_tests (struct passwd *pt, struct hostent *ht) > host_buf, sizeof(host_buf), > NULL, 0, NI_NOFQDN); > > - TEST_VERIFY (res == 0); > + TEST_COMPARE (res, 0); > if (res == 0) > TEST_VERIFY (strcmp (ht[i].h_name, host_buf) == 0); > else > @@ -285,8 +292,8 @@ test_cross_switch_consistency (void) > TEST_VERIFY (p != NULL); > if (p != NULL) > { > - TEST_VERIFY (strcmp (p->pw_name, pwd_table_1[i].pw_name) == 0); > - TEST_VERIFY (p->pw_uid == pwd_table_1[i].pw_uid); > + TEST_COMPARE_STRING (p->pw_name, pwd_table_1[i].pw_name); > + TEST_COMPARE (p->pw_uid, pwd_table_1[i].pw_uid); > } > > /* After the first lookup, switch to conf2 and verify */ > @@ -296,7 +303,7 @@ test_cross_switch_consistency (void) > xrename ("/etc/nsswitch.conf2", "/etc/nsswitch.conf"); > > p = getpwnam (pwd_table_2[0].pw_name); > - TEST_VERIFY (p->pw_uid == pwd_table_2[0].pw_uid); > + TEST_COMPARE (p->pw_uid, pwd_table_2[0].pw_uid); > } > > /* But the original loop should still be on conf1. */ > @@ -311,8 +318,8 @@ test_cross_switch_consistency (void) > TEST_VERIFY (p != NULL); > if (p != NULL) > { > - TEST_VERIFY (strcmp (p->pw_name, pwd_table_2[i].pw_name) == 0); > - TEST_VERIFY (p->pw_uid == pwd_table_2[i].pw_uid); > + TEST_COMPARE_STRING (p->pw_name, pwd_table_2[i].pw_name); > + TEST_COMPARE (p->pw_uid, pwd_table_2[i].pw_uid); > } > } > endpwent (); > > base-commit: 774d43f27dbc730ee4b8b37bce4d5b3d5c0b74b6