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 43F87EE3F3F for ; Tue, 12 Sep 2023 23:02:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694559736; 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=PrMRRDmHaMmIEP4nBssT4lJLts9SxaE774wGAmsECdY=; b=Pa4sfCEdlGB6qVL5qrCOcMfP2ejw/vJ0jLikWqKMyL4ngie2ZW11G5LV5nfk49PnkDcnZZ 9aUr2V66Vmm33DB67Q4crduV829c6Fwfr877eZU8LqeLZE6rhNw8R8GMlMyYJ2N2a87yR2 fr1POIspnzJzzvQCemxUafehtwyiQAg= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-446-ScNfOLLvNN-gUph4R-YWOw-1; Tue, 12 Sep 2023 19:02:13 -0400 X-MC-Unique: ScNfOLLvNN-gUph4R-YWOw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2C0C8380350C; Tue, 12 Sep 2023 23:02:11 +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 1739E44029; Tue, 12 Sep 2023 23:02:11 +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 E5A2219465A8; Tue, 12 Sep 2023 23:02:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7DE5D194658D for ; Tue, 12 Sep 2023 23:01:31 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6BE2A40C200A; Tue, 12 Sep 2023 23:01:31 +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 4C67040C2009; Tue, 12 Sep 2023 23:01:31 +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 38CN1NXL031202; Tue, 12 Sep 2023 18:01:23 -0500 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 38CN1Mgr031201; Tue, 12 Sep 2023 18:01:22 -0500 Date: Tue, 12 Sep 2023 18:01:22 -0500 From: Benjamin Marzinski To: mwilck@suse.com Message-ID: <20230912230122.GT7412@octiron.msp.redhat.com> References: <20230911163846.27197-1-mwilck@suse.com> <20230911163846.27197-26-mwilck@suse.com> MIME-Version: 1.0 In-Reply-To: <20230911163846.27197-26-mwilck@suse.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Subject: Re: [dm-devel] [PATCH v2 25/37] multipath-tools tests: adapt alias tests for total ordering 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.5 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 Mon, Sep 11, 2023 at 06:38:34PM +0200, mwilck@suse.com wrote: > From: Martin Wilck > > The "unsorted" test fail now, and are removed. The algorithm is now > better at finding "gaps". > Reviewed-by: Benjamin Marzinski > Signed-off-by: Martin Wilck > --- > tests/alias.c | 88 ++++++++------------------------------------------- > 1 file changed, 14 insertions(+), 74 deletions(-) > > diff --git a/tests/alias.c b/tests/alias.c > index 8ed95d7..dff5f93 100644 > --- a/tests/alias.c > +++ b/tests/alias.c > @@ -439,27 +439,7 @@ static void mock_self_alias(const char *alias, const char *wwid) > expect_condlog(3, USED_STR(alias, wwid)); \ > } while(0) > > -static int add_binding_unsorted(Bindings *bindings, > - const char *alias, const char *wwid) > -{ > - struct binding *bdg = calloc(1, sizeof(*bdg)); > - > - if (!bdg) > - return -1; > - bdg->wwid = strdup(wwid); > - bdg->alias = strdup(alias); > - if (!bdg->wwid || !bdg->alias || !vector_alloc_slot(bindings)) { > - free(bdg->alias); > - free(bdg->wwid); > - free(bdg); > - return BINDING_ERROR; > - } > - vector_set_slot(bindings, bdg); > - return BINDING_ADDED; > -} > - > -static void __mock_bindings_file(const char *content, > - int (*add)(Bindings *, const char *, const char *)) > +static void __mock_bindings_file(const char *content) > { > char *cnt __attribute__((cleanup(cleanup_charp))) = NULL; > char *token, *savep = NULL; > @@ -478,17 +458,13 @@ static void __mock_bindings_file(const char *content, > == READ_BINDING_SKIP) > continue; > > - rc = add(&global_bindings, alias, wwid); > + rc = add_binding(&global_bindings, alias, wwid); > assert_int_equal(rc, BINDING_ADDED); > } > } > > static void mock_bindings_file(const char *content) { > - return __mock_bindings_file(content, add_binding); > -} > - > -static void mock_bindings_file_unsorted(const char *content) { > - return __mock_bindings_file(content, add_binding_unsorted); > + return __mock_bindings_file(content); > } > > static int teardown_bindings(void **state) > @@ -861,10 +837,6 @@ static void lb_nomatch_b_z_a(void **state) > int rc; > char *alias; > > - /* > - * add_bindings() sorts alphabetically. Therefore get_free_id() > - * finds MPATHc as a free entry. > - */ > mock_bindings_file("MPATHb WWID1\n" > "MPATHz WWID26\n" > "MPATHa WWID0\n"); > @@ -880,10 +852,6 @@ static void lb_nomatch_b_aa_a(void **state) > int rc; > char *alias; > > - /* > - * add_bindings() sorts alphabetically. ("a", "aa", b"). > - * The get_free_id() algorithm finds the "hole" after "b". > - */ > mock_bindings_file("MPATHb WWID1\n" > "MPATHz WWID26\n" > "MPATHa WWID0\n"); > @@ -911,10 +879,6 @@ static void lb_nomatch_b_a_aa(void **state) > char *alias; > STRBUF_ON_STACK(buf); > > - /* > - * add_bindings() sorts alphabetically. ("a", "aa", "ab", "b", "c", ...) > - * lookup_binding finds MPATHac as next free entry. > - */ > fill_bindings(&buf, 0, 26); > mock_bindings_file(get_strbuf_str(&buf)); > expect_condlog(3, NOMATCH_WWID_STR("WWID28")); > @@ -930,10 +894,6 @@ static void lb_nomatch_b_a_aa_zz(void **state) > char *alias; > STRBUF_ON_STACK(buf); > > - /* > - * add_bindings() sorts alphabetically. ("a", "aa", "ab", "b", "c", ...) > - * lookup_binding finds MPATHab as next free entry. > - */ > fill_bindings(&buf, 0, 26); > print_strbuf(&buf, "MPATHzz WWID676\n"); > mock_bindings_file(get_strbuf_str(&buf)); > @@ -944,25 +904,6 @@ static void lb_nomatch_b_a_aa_zz(void **state) > assert_ptr_equal(alias, NULL); > } > > -static void lb_nomatch_b_z_a_unsorted(void **state) > -{ > - int rc; > - char *alias; > - > - /* > - * With unsorted bindings (shouldn't happen normally), get_free_id() > - * plays safe and returns MPATHaa as first free entry. > - */ > - mock_bindings_file_unsorted("MPATHb WWID1\n" > - "MPATHz WWID26\n" > - "MPATHa WWID0\n"); > - expect_condlog(3, NOMATCH_WWID_STR("WWID2")); > - mock_unused_alias("MPATHaa"); > - rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", 1); > - assert_int_equal(rc, 27); > - assert_ptr_equal(alias, NULL); > -} > - > static void lb_nomatch_b_a(void **state) > { > int rc; > @@ -1027,9 +968,9 @@ static void lb_nomatch_int_max_used(void **state) > mock_bindings_file(get_strbuf_str(&buf)); > expect_condlog(3, NOMATCH_WWID_STR("WWIDNOMORE")); > mock_used_alias("MPATHa", "WWIDNOMORE"); > - expect_condlog(0, NOMORE_STR); > + mock_unused_alias("MPATHab"); > rc = lookup_binding(NULL, "WWIDNOMORE", &alias, "MPATH", 1); > - assert_int_equal(rc, -1); > + assert_int_equal(rc, 28); > assert_ptr_equal(alias, NULL); > } > > @@ -1077,9 +1018,9 @@ static void lb_nomatch_int_max_m1_1_used(void **state) > mock_bindings_file(get_strbuf_str(&buf)); > expect_condlog(3, NOMATCH_WWID_STR("WWIDMAX")); > mock_used_alias("MPATHa", "WWIDMAX"); > - mock_unused_alias("MPATH" MPATH_ID_INT_MAX); > + mock_unused_alias("MPATHab"); > rc = lookup_binding(NULL, "WWIDMAX", &alias, "MPATH", 1); > - assert_int_equal(rc, INT_MAX); > + assert_int_equal(rc, 28); > assert_ptr_equal(alias, NULL); > } > > @@ -1095,10 +1036,10 @@ static void lb_nomatch_int_max_m1_2_used(void **state) > > expect_condlog(3, NOMATCH_WWID_STR("WWIDMAX")); > mock_used_alias("MPATHa", "WWIDMAX"); > - mock_used_alias("MPATH" MPATH_ID_INT_MAX, "WWIDMAX"); > - expect_condlog(0, NOMORE_STR); > + mock_used_alias("MPATHab", "WWIDMAX"); > + mock_unused_alias("MPATHac"); > rc = lookup_binding(NULL, "WWIDMAX", &alias, "MPATH", 1); > - assert_int_equal(rc, -1); > + assert_int_equal(rc, 29); > assert_ptr_equal(alias, NULL); > } > #endif > @@ -1133,7 +1074,6 @@ static int test_lookup_binding(void) > cmocka_unit_test_teardown(lb_nomatch_b_aa_a, teardown_bindings), > cmocka_unit_test_teardown(lb_nomatch_b_a_aa, teardown_bindings), > cmocka_unit_test_teardown(lb_nomatch_b_a_aa_zz, teardown_bindings), > - cmocka_unit_test_teardown(lb_nomatch_b_z_a_unsorted, teardown_bindings), > cmocka_unit_test_teardown(lb_nomatch_b_a, teardown_bindings), > cmocka_unit_test_teardown(lb_nomatch_b_a_3_used, teardown_bindings), > #ifdef MPATH_ID_INT_MAX > @@ -1593,14 +1533,14 @@ static void gufa_nomatch_b_f_a(void **state) { > "MPATHf WWID6\n" > "MPATHa WWID0\n"); > > - mock_bindings_file_unsorted(bindings); > + mock_bindings_file(bindings); > expect_condlog(3, NOMATCH_WWID_STR("WWID7")); > - mock_unused_alias("MPATHg"); > + mock_unused_alias("MPATHc"); > > - mock_allocate_binding_len("MPATHg", "WWID7", sizeof(bindings) - 1); > + mock_allocate_binding_len("MPATHc", "WWID7", sizeof(bindings) - 1); > > alias = get_user_friendly_alias("WWID7", "x", "", "MPATH", false); > - assert_string_equal(alias, "MPATHg"); > + assert_string_equal(alias, "MPATHc"); > free(alias); > } > > -- > 2.42.0 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel