From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 75507EE14A9 for ; Wed, 6 Sep 2023 22:44:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694040268; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=qr/fhBtZyjtvvsAFq5O9s86ed6Vh4WGhxqLDg522eKE=; b=FeMvUeJxGlSbql39skaIN//3nsUTKcBraHCC71Fg1O6OPHcM7bKxuboeazD+O/eAAXC1h8 nzWdTqZpBspGK0lcBpSQjw4mXUPl3E08LNBh326W7/3lFFnvA83j3M9rsPDIEdRZXzWxYe Wg6oBWaK6xtijNTpmkvljwErpdu9M78= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-348-DLujVCZsNailUofz2fAMhw-1; Wed, 06 Sep 2023 18:44:25 -0400 X-MC-Unique: DLujVCZsNailUofz2fAMhw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C2145802A6E; Wed, 6 Sep 2023 22:44:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id ABA441121318; Wed, 6 Sep 2023 22:44:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7DF86194658C; Wed, 6 Sep 2023 22:44:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 77046194658C for ; Wed, 6 Sep 2023 22:44:22 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 50E9FC03292; Wed, 6 Sep 2023 22:44:22 +0000 (UTC) Received: from octiron.msp.redhat.com (octiron.msp.redhat.com [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1A32DD47819; Wed, 6 Sep 2023 22:44:22 +0000 (UTC) Received: from octiron.msp.redhat.com (localhost.localdomain [127.0.0.1]) by octiron.msp.redhat.com (8.14.9/8.14.9) with ESMTP id 386MiCWi028954; Wed, 6 Sep 2023 17:44:12 -0500 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 386MiCWi028953; Wed, 6 Sep 2023 17:44:12 -0500 Date: Wed, 6 Sep 2023 17:44:12 -0500 From: Benjamin Marzinski To: mwilck@suse.com Message-ID: <20230906224412.GU7412@octiron.msp.redhat.com> References: <20230901180235.23980-1-mwilck@suse.com> <20230901180235.23980-10-mwilck@suse.com> MIME-Version: 1.0 In-Reply-To: <20230901180235.23980-10-mwilck@suse.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Subject: Re: [dm-devel] [PATCH 09/21] multipath-tools tests: convert mock_{failed, used}_alias to macros X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dm-devel@redhat.com Errors-To: dm-devel-bounces@redhat.com Sender: "dm-devel" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Fri, Sep 01, 2023 at 08:02:22PM +0200, mwilck@suse.com wrote: > From: Martin Wilck > > This way we can further improve readability of the individual test > cases. > Reviewed-by: Benjamin Marzinski > Signed-off-by: Martin Wilck > --- > tests/alias.c | 98 +++++++++++++++++++++++++-------------------------- > 1 file changed, 49 insertions(+), 49 deletions(-) > > diff --git a/tests/alias.c b/tests/alias.c > index 1c9903c..cb6695b 100644 > --- a/tests/alias.c > +++ b/tests/alias.c > @@ -445,26 +445,26 @@ static void mock_self_alias(const char *alias, const char *wwid) > #define REUSE_STR(alias_str, wwid_str) ("alias " alias_str " already bound to wwid " wwid_str ", cannot reuse\n") > #define NOMORE_STR "no more available user_friendly_names\n" > > -static void mock_failed_alias(const char *alias, char *msg) > -{ > - expect_string(__wrap_dm_map_present, str, alias); > - will_return(__wrap_dm_map_present, 1); > - expect_string(__wrap_dm_get_uuid, name, alias); > - expect_value(__wrap_dm_get_uuid, uuid_len, WWID_SIZE); > - will_return(__wrap_dm_get_uuid, 1); > - expect_condlog(3, msg); > -} > +#define mock_failed_alias(alias, wwid) \ > + do { \ > + expect_string(__wrap_dm_map_present, str, alias); \ > + will_return(__wrap_dm_map_present, 1); \ > + expect_string(__wrap_dm_get_uuid, name, alias); \ > + expect_value(__wrap_dm_get_uuid, uuid_len, WWID_SIZE); \ > + will_return(__wrap_dm_get_uuid, 1); \ > + expect_condlog(3, USED_STR(alias, wwid)); \ > + } while (0) > > -static void mock_used_alias(const char *alias, char *msg) > -{ > - expect_string(__wrap_dm_map_present, str, alias); > - will_return(__wrap_dm_map_present, 1); > - expect_string(__wrap_dm_get_uuid, name, alias); > - expect_value(__wrap_dm_get_uuid, uuid_len, WWID_SIZE); > - will_return(__wrap_dm_get_uuid, 0); > - will_return(__wrap_dm_get_uuid, "WWID_USED"); > - expect_condlog(3, msg); > -} > +#define mock_used_alias(alias, wwid) \ > + do { \ > + expect_string(__wrap_dm_map_present, str, alias); \ > + will_return(__wrap_dm_map_present, 1); \ > + expect_string(__wrap_dm_get_uuid, name, alias); \ > + expect_value(__wrap_dm_get_uuid, uuid_len, WWID_SIZE); \ > + will_return(__wrap_dm_get_uuid, 0); \ > + will_return(__wrap_dm_get_uuid, "WWID_USED"); \ > + expect_condlog(3, USED_STR(alias, wwid)); \ > + } while(0) > > static void mock_bindings_file(const char *content, int match_line) > { > @@ -516,7 +516,7 @@ static void lb_empty_failed(void **state) > char *alias; > > will_return(__wrap_fgets, NULL); > - mock_failed_alias("MPATHa", USED_STR("MPATHa", "WWID0")); > + mock_failed_alias("MPATHa", "WWID0"); > mock_unused_alias("MPATHb"); > expect_condlog(3, NOMATCH_WWID_STR("WWID0")); > rc = lookup_binding(NULL, "WWID0", &alias, "MPATH", 1); > @@ -531,7 +531,7 @@ static void lb_empty_1_used(void **state) > char *alias; > > will_return(__wrap_fgets, NULL); > - mock_used_alias("MPATHa", USED_STR("MPATHa", "WWID0")); > + mock_used_alias("MPATHa", "WWID0"); > mock_unused_alias("MPATHb"); > expect_condlog(3, NOMATCH_WWID_STR("WWID0")); > rc = lookup_binding(NULL, "WWID0", &alias, "MPATH", 1); > @@ -546,7 +546,7 @@ static void lb_empty_1_used_self(void **state) > char *alias; > > will_return(__wrap_fgets, NULL); > - mock_used_alias("MPATHa", USED_STR("MPATHa", "WWID0")); > + mock_used_alias("MPATHa", "WWID0"); > mock_self_alias("MPATHb", "WWID0"); > expect_condlog(3, NOMATCH_WWID_STR("WWID0")); > rc = lookup_binding(NULL, "WWID0", &alias, "MPATH", 1); > @@ -616,10 +616,10 @@ static void lb_nomatch_a_3_used_failed_self(void **state) > > will_return(__wrap_fgets, "MPATHa WWID0\n"); > will_return(__wrap_fgets, NULL); > - mock_used_alias("MPATHb", USED_STR("MPATHb", "WWID1")); > - mock_used_alias("MPATHc", USED_STR("MPATHc", "WWID1")); > - mock_used_alias("MPATHd", USED_STR("MPATHd", "WWID1")); > - mock_failed_alias("MPATHe", USED_STR("MPATHe", "WWID1")); > + mock_used_alias("MPATHb", "WWID1"); > + mock_used_alias("MPATHc", "WWID1"); > + mock_used_alias("MPATHd", "WWID1"); > + mock_failed_alias("MPATHe", "WWID1"); > mock_self_alias("MPATHf", "WWID1"); > expect_condlog(3, NOMATCH_WWID_STR("WWID1")); > rc = lookup_binding(NULL, "WWID1", &alias, "MPATH", 1); > @@ -689,7 +689,7 @@ static void lb_nomatch_a_d_1_used(void **state) > will_return(__wrap_fgets, "MPATHa WWID0\n"); > will_return(__wrap_fgets, "MPATHd WWID1\n"); > will_return(__wrap_fgets, NULL); > - mock_used_alias("MPATHb", USED_STR("MPATHb", "WWID2")); > + mock_used_alias("MPATHb", "WWID2"); > mock_unused_alias("MPATHc"); > expect_condlog(3, NOMATCH_WWID_STR("WWID2")); > rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", 1); > @@ -705,8 +705,8 @@ static void lb_nomatch_a_d_2_used(void **state) > will_return(__wrap_fgets, "MPATHa WWID0\n"); > will_return(__wrap_fgets, "MPATHd WWID1\n"); > will_return(__wrap_fgets, NULL); > - mock_used_alias("MPATHb", USED_STR("MPATHb", "WWID2")); > - mock_used_alias("MPATHc", USED_STR("MPATHc", "WWID2")); > + mock_used_alias("MPATHb", "WWID2"); > + mock_used_alias("MPATHc", "WWID2"); > mock_unused_alias("MPATHe"); > expect_condlog(3, NOMATCH_WWID_STR("WWID2")); > rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", 1); > @@ -722,9 +722,9 @@ static void lb_nomatch_a_d_3_used(void **state) > will_return(__wrap_fgets, "MPATHa WWID0\n"); > will_return(__wrap_fgets, "MPATHd WWID1\n"); > will_return(__wrap_fgets, NULL); > - mock_used_alias("MPATHb", USED_STR("MPATHb", "WWID2")); > - mock_used_alias("MPATHc", USED_STR("MPATHc", "WWID2")); > - mock_used_alias("MPATHe", USED_STR("MPATHe", "WWID2")); > + mock_used_alias("MPATHb", "WWID2"); > + mock_used_alias("MPATHc", "WWID2"); > + mock_used_alias("MPATHe", "WWID2"); > mock_unused_alias("MPATHf"); > expect_condlog(3, NOMATCH_WWID_STR("WWID2")); > rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", 1); > @@ -771,7 +771,7 @@ static void lb_nomatch_d_a_1_used(void **state) > will_return(__wrap_fgets, "MPATHa WWID0\n"); > will_return(__wrap_fgets, "MPATHd WWID0\n"); > will_return(__wrap_fgets, NULL); > - mock_used_alias("MPATHb", USED_STR("MPATHb", "WWID2")); > + mock_used_alias("MPATHb", "WWID2"); > mock_unused_alias("MPATHe"); > expect_condlog(3, NOMATCH_WWID_STR("WWID2")); > rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", 1); > @@ -851,9 +851,9 @@ static void lb_nomatch_b_a_3_used(void **state) > will_return(__wrap_fgets, "MPATHz WWID26\n"); > will_return(__wrap_fgets, "MPATHa WWID0\n"); > will_return(__wrap_fgets, NULL); > - mock_used_alias("MPATHaa", USED_STR("MPATHaa", "WWID2")); > - mock_used_alias("MPATHab", USED_STR("MPATHab", "WWID2")); > - mock_used_alias("MPATHac", USED_STR("MPATHac", "WWID2")); > + mock_used_alias("MPATHaa", "WWID2"); > + mock_used_alias("MPATHab", "WWID2"); > + mock_used_alias("MPATHac", "WWID2"); > mock_unused_alias("MPATHad"); > expect_condlog(3, NOMATCH_WWID_STR("WWID2")); > rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", 1); > @@ -895,7 +895,7 @@ static void lb_nomatch_int_max_used(void **state) > will_return(__wrap_fgets, "MPATHb WWID1\n"); > will_return(__wrap_fgets, "MPATH" MPATH_ID_INT_MAX " WWIDMAX\n"); > will_return(__wrap_fgets, NULL); > - mock_used_alias("MPATHa", USED_STR("MPATHa", "WWID2")); > + mock_used_alias("MPATHa", "WWID2"); > expect_condlog(0, NOMORE_STR); > rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", 1); > assert_int_equal(rc, -1); > @@ -926,7 +926,7 @@ static void lb_nomatch_int_max_m1_used(void **state) > will_return(__wrap_fgets, "MPATH" MPATH_ID_INT_MAX_m1 " WWIDMAX\n"); > will_return(__wrap_fgets, "MPATHa WWID0\n"); > will_return(__wrap_fgets, NULL); > - mock_used_alias("MPATH" MPATH_ID_INT_MAX, USED_STR("MPATH" MPATH_ID_INT_MAX, "WWID2")); > + mock_used_alias("MPATH" MPATH_ID_INT_MAX, "WWID2"); > expect_condlog(0, NOMORE_STR); > rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", 1); > assert_int_equal(rc, -1); > @@ -941,7 +941,7 @@ static void lb_nomatch_int_max_m1_1_used(void **state) > will_return(__wrap_fgets, "MPATHb WWID1\n"); > will_return(__wrap_fgets, "MPATH" MPATH_ID_INT_MAX_m1 " WWIDMAX\n"); > will_return(__wrap_fgets, NULL); > - mock_used_alias("MPATHa", USED_STR("MPATHa", "WWID2")); > + mock_used_alias("MPATHa", "WWID2"); > mock_unused_alias("MPATH" MPATH_ID_INT_MAX); > expect_condlog(3, NOMATCH_WWID_STR("WWID2")); > rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", 1); > @@ -957,8 +957,8 @@ static void lb_nomatch_int_max_m1_2_used(void **state) > will_return(__wrap_fgets, "MPATHb WWID1\n"); > will_return(__wrap_fgets, "MPATH" MPATH_ID_INT_MAX_m1 " WWIDMAX\n"); > will_return(__wrap_fgets, NULL); > - mock_used_alias("MPATHa", USED_STR("MPATHa", "WWID2")); > - mock_used_alias("MPATH" MPATH_ID_INT_MAX, USED_STR("MPATH" MPATH_ID_INT_MAX, "WWID2")); > + mock_used_alias("MPATHa", "WWID2"); > + mock_used_alias("MPATH" MPATH_ID_INT_MAX, "WWID2"); > expect_condlog(0, NOMORE_STR); > rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", 1); > assert_int_equal(rc, -1); > @@ -1291,7 +1291,7 @@ static void gufa_match_a_used(void **state) { > > will_return(__wrap_fgets, BINDING_STR("MPATHa", "WWID0")); > expect_condlog(3, FOUND_STR("MPATHa", "WWID0")); > - mock_used_alias("MPATHa", USED_STR("MPATHa", "WWID0")); > + mock_used_alias("MPATHa", "WWID0"); > > alias = get_user_friendly_alias("WWID0", "x", "", "MPATH", true); > assert_ptr_equal(alias, NULL); > @@ -1355,7 +1355,7 @@ static void gufa_nomatch_c_b_used(void **state) { > mock_bindings_file("MPATHc WWID2\n" > "MPATHb WWID1", > -1); > - mock_used_alias("MPATHa", USED_STR("MPATHa", "WWID4")); > + mock_used_alias("MPATHa", "WWID4"); > expect_condlog(3, NOMATCH_WWID_STR("WWID4")); > mock_unused_alias("MPATHd"); > > @@ -1434,7 +1434,7 @@ static void gufa_old_empty_used(void **state) { > > will_return(__wrap_fgets, NULL); > expect_condlog(3, NOMATCH_WWID_STR("WWID0")); > - mock_used_alias("MPATHz", USED_STR("MPATHz", "WWID0")); > + mock_used_alias("MPATHz", "WWID0"); > expect_condlog(0, ERR_STR("MPATHz", "WWID0")); > > alias = get_user_friendly_alias("WWID0", "x", "MPATHz", "MPATH", false); > @@ -1475,7 +1475,7 @@ static void gufa_old_match_used(void **state) { > > mock_bindings_file("MPATHz WWID0", 0); > expect_condlog(3, FOUND_ALIAS_STR("MPATHz", "WWID0")); > - mock_used_alias("MPATHz", USED_STR("MPATHz", "WWID0")); > + mock_used_alias("MPATHz", "WWID0"); > expect_condlog(0, ERR_STR("MPATHz", "WWID0")); > > alias = get_user_friendly_alias("WWID0", "x", "MPATHz", "MPATH", false); > @@ -1514,7 +1514,7 @@ static void gufa_old_match_other_used(void **state) { > expect_condlog(0, REUSE_STR("MPATHz", "WWID9")); > > mock_bindings_file(bindings, -1); > - mock_used_alias("MPATHa", USED_STR("MPATHa", "WWID0")); > + mock_used_alias("MPATHa", "WWID0"); > expect_condlog(3, NOMATCH_WWID_STR("WWID0")); > mock_unused_alias("MPATHb"); > > @@ -1557,7 +1557,7 @@ static void gufa_old_match_other_wwidmatch_used(void **state) { > > mock_bindings_file(bindings, 1); > expect_condlog(3, FOUND_STR("MPATHc", "WWID2")); > - mock_used_alias("MPATHc", USED_STR("MPATHc", "WWID2")); > + mock_used_alias("MPATHc", "WWID2"); > > alias = get_user_friendly_alias("WWID2", "x", "MPATHz", "MPATH", false); > assert_ptr_equal(alias, NULL); > @@ -1592,7 +1592,7 @@ static void gufa_old_nomatch_wwidmatch_used(void **state) { > > mock_bindings_file(bindings, 0); > expect_condlog(3, FOUND_STR("MPATHa", "WWID0")); > - mock_used_alias("MPATHa", USED_STR("MPATHa", "WWID0")); > + mock_used_alias("MPATHa", "WWID0"); > > alias = get_user_friendly_alias("WWID0", "x", "MPATHz", "MPATH", false); > assert_ptr_equal(alias, NULL); > @@ -1632,7 +1632,7 @@ static void gufa_old_nomatch_nowwidmatch_used(void **state) { > mock_bindings_file(bindings, -1); > expect_condlog(3, NOMATCH_WWID_STR("WWID0")); > > - mock_used_alias("MPATHz", USED_STR("MPATHz", "WWID0")); > + mock_used_alias("MPATHz", "WWID0"); > expect_condlog(0, ERR_STR("MPATHz", "WWID0")); > > alias = get_user_friendly_alias("WWID0", "x", "MPATHz", "MPATH", false); > -- > 2.41.0 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel