From: Benjamin Marzinski <bmarzins@redhat.com>
To: mwilck@suse.com
Cc: dm-devel@redhat.com
Subject: Re: [dm-devel] [PATCH 10/21] multipath-tools test: use mock_bindings_file() consistently
Date: Wed, 6 Sep 2023 17:43:54 -0500 [thread overview]
Message-ID: <20230906224354.GT7412@octiron.msp.redhat.com> (raw)
In-Reply-To: <20230901180235.23980-11-mwilck@suse.com>
On Fri, Sep 01, 2023 at 08:02:23PM +0200, mwilck@suse.com wrote:
> From: Martin Wilck <mwilck@suse.com>
>
> Further improve test readablity.
>
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
> Signed-off-by: Martin Wilck <mwilck@suse.com>
> ---
> tests/alias.c | 186 ++++++++++++++++++++++----------------------------
> 1 file changed, 80 insertions(+), 106 deletions(-)
>
> diff --git a/tests/alias.c b/tests/alias.c
> index cb6695b..a1415c6 100644
> --- a/tests/alias.c
> +++ b/tests/alias.c
> @@ -489,7 +489,7 @@ static void lb_empty(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("", -1);
> expect_condlog(3, NOMATCH_WWID_STR("WWID0"));
> rc = lookup_binding(NULL, "WWID0", &alias, NULL, 0);
> assert_int_equal(rc, 1);
> @@ -501,7 +501,7 @@ static void lb_empty_unused(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("", -1);
> mock_unused_alias("MPATHa");
> expect_condlog(3, NOMATCH_WWID_STR("WWID0"));
> rc = lookup_binding(NULL, "WWID0", &alias, "MPATH", 1);
> @@ -515,7 +515,7 @@ static void lb_empty_failed(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("", -1);
> mock_failed_alias("MPATHa", "WWID0");
> mock_unused_alias("MPATHb");
> expect_condlog(3, NOMATCH_WWID_STR("WWID0"));
> @@ -530,7 +530,7 @@ static void lb_empty_1_used(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("", -1);
> mock_used_alias("MPATHa", "WWID0");
> mock_unused_alias("MPATHb");
> expect_condlog(3, NOMATCH_WWID_STR("WWID0"));
> @@ -545,7 +545,7 @@ static void lb_empty_1_used_self(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("", -1);
> mock_used_alias("MPATHa", "WWID0");
> mock_self_alias("MPATHb", "WWID0");
> expect_condlog(3, NOMATCH_WWID_STR("WWID0"));
> @@ -560,7 +560,7 @@ static void lb_match_a(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> + mock_bindings_file("MPATHa WWID0\n", 0);
> expect_condlog(3, FOUND_STR("MPATHa", "WWID0"));
> rc = lookup_binding(NULL, "WWID0", &alias, "MPATH", 0);
> assert_int_equal(rc, 0);
> @@ -574,8 +574,7 @@ static void lb_nomatch_a(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHa WWID0\n", -1);
> expect_condlog(3, NOMATCH_WWID_STR("WWID1"));
> rc = lookup_binding(NULL, "WWID1", &alias, "MPATH", 0);
> assert_int_equal(rc, 2);
> @@ -587,8 +586,7 @@ static void lb_nomatch_a_bad_check(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHa WWID0\n", -1);
> expect_condlog(0, NOMORE_STR);
> rc = lookup_binding(NULL, "WWID1", &alias, NULL, 1);
> assert_int_equal(rc, -1);
> @@ -600,8 +598,7 @@ static void lb_nomatch_a_unused(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHa WWID0\n", -1);
> mock_unused_alias("MPATHb");
> expect_condlog(3, NOMATCH_WWID_STR("WWID1"));
> rc = lookup_binding(NULL, "WWID1", &alias, "MPATH", 1);
> @@ -614,8 +611,7 @@ static void lb_nomatch_a_3_used_failed_self(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHa WWID0\n", -1);
> mock_used_alias("MPATHb", "WWID1");
> mock_used_alias("MPATHc", "WWID1");
> mock_used_alias("MPATHd", "WWID1");
> @@ -632,8 +628,8 @@ static void do_lb_match_c(void **state, int check_if_taken)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, "MPATHc WWID1\n");
> + mock_bindings_file("MPATHa WWID0\n"
> + "MPATHc WWID1", 1);
> expect_condlog(3, FOUND_STR("MPATHc", "WWID1"));
> rc = lookup_binding(NULL, "WWID1", &alias, "MPATH", check_if_taken);
> assert_int_equal(rc, 0);
> @@ -657,9 +653,8 @@ static void lb_nomatch_a_c(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, "MPATHc WWID1\n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHa WWID0\n"
> + "MPATHc WWID1", -1);
> expect_condlog(3, NOMATCH_WWID_STR("WWID2"));
> rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", 0);
> assert_int_equal(rc, 2);
> @@ -671,9 +666,8 @@ static void lb_nomatch_a_d_unused(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, "MPATHd WWID1\n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHa WWID0\n"
> + "MPATHd WWID1", -1);
> mock_unused_alias("MPATHb");
> expect_condlog(3, NOMATCH_WWID_STR("WWID2"));
> rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", 1);
> @@ -686,9 +680,8 @@ static void lb_nomatch_a_d_1_used(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, "MPATHd WWID1\n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHa WWID0\n"
> + "MPATHd WWID1", -1);
> mock_used_alias("MPATHb", "WWID2");
> mock_unused_alias("MPATHc");
> expect_condlog(3, NOMATCH_WWID_STR("WWID2"));
> @@ -702,9 +695,8 @@ static void lb_nomatch_a_d_2_used(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, "MPATHd WWID1\n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHa WWID0\n"
> + "MPATHd WWID1", -1);
> mock_used_alias("MPATHb", "WWID2");
> mock_used_alias("MPATHc", "WWID2");
> mock_unused_alias("MPATHe");
> @@ -719,9 +711,8 @@ static void lb_nomatch_a_d_3_used(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, "MPATHd WWID1\n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHa WWID0\n"
> + "MPATHd WWID1", -1);
> mock_used_alias("MPATHb", "WWID2");
> mock_used_alias("MPATHc", "WWID2");
> mock_used_alias("MPATHe", "WWID2");
> @@ -737,9 +728,8 @@ static void lb_nomatch_c_a(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHc WWID1\n");
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHc WWID1\n"
> + "MPATHa WWID0\n", -1);
> expect_condlog(3, NOMATCH_WWID_STR("WWID2"));
> rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", 0);
> assert_int_equal(rc, 2);
> @@ -751,10 +741,9 @@ static void lb_nomatch_d_a_unused(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHc WWID1\n");
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, "MPATHd WWID0\n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHc WWID1\n"
> + "MPATHa WWID0\n"
> + "MPATHd WWID0\n", -1);
> mock_unused_alias("MPATHb");
> expect_condlog(3, NOMATCH_WWID_STR("WWID2"));
> rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", 1);
> @@ -767,10 +756,9 @@ static void lb_nomatch_d_a_1_used(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHc WWID1\n");
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, "MPATHd WWID0\n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHc WWID1\n"
> + "MPATHa WWID0\n"
> + "MPATHd WWID0\n", -1);
> mock_used_alias("MPATHb", "WWID2");
> mock_unused_alias("MPATHe");
> expect_condlog(3, NOMATCH_WWID_STR("WWID2"));
> @@ -784,10 +772,9 @@ static void lb_nomatch_a_b(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, "MPATHz WWID26\n");
> - will_return(__wrap_fgets, "MPATHb WWID1\n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHa WWID0\n"
> + "MPATHz WWID26\n"
> + "MPATHb WWID1\n", -1);
> expect_condlog(3, NOMATCH_WWID_STR("WWID2"));
> rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", 0);
> assert_int_equal(rc, 3);
> @@ -799,10 +786,9 @@ static void lb_nomatch_a_b_bad(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, "MPATHz WWID26\n");
> - will_return(__wrap_fgets, "MPATHb\n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHa WWID0\n"
> + "MPATHz WWID26\n"
> + "MPATHb\n", -1);
> expect_condlog(3, "Ignoring malformed line 3 in bindings file\n");
> expect_condlog(3, NOMATCH_WWID_STR("WWID2"));
> rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", 0);
> @@ -815,10 +801,9 @@ static void lb_nomatch_a_b_bad_self(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, "MPATHz WWID26\n");
> - will_return(__wrap_fgets, "MPATHb\n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHa WWID0\n"
> + "MPATHz WWID26\n"
> + "MPATHb\n", -1);
> expect_condlog(3, "Ignoring malformed line 3 in bindings file\n");
> mock_self_alias("MPATHc", "WWID2");
> expect_condlog(3, NOMATCH_WWID_STR("WWID2"));
> @@ -832,10 +817,9 @@ static void lb_nomatch_b_a(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHb WWID1\n");
> - will_return(__wrap_fgets, "MPATHz WWID26\n");
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHb WWID1\n"
> + "MPATHz WWID26\n"
> + "MPATHa WWID0\n", -1);
> expect_condlog(3, NOMATCH_WWID_STR("WWID2"));
> rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", 0);
> assert_int_equal(rc, 27);
> @@ -847,10 +831,9 @@ static void lb_nomatch_b_a_3_used(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHb WWID1\n");
> - will_return(__wrap_fgets, "MPATHz WWID26\n");
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHb WWID1\n"
> + "MPATHz WWID26\n"
> + "MPATHa WWID0\n", -1);
> mock_used_alias("MPATHaa", "WWID2");
> mock_used_alias("MPATHab", "WWID2");
> mock_used_alias("MPATHac", "WWID2");
> @@ -867,10 +850,9 @@ static void do_lb_nomatch_int_max(void **state, int check_if_taken)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHb WWID1\n");
> - will_return(__wrap_fgets, "MPATH" MPATH_ID_INT_MAX " WWIDMAX\n");
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHb WWID1\n"
> + "MPATH" MPATH_ID_INT_MAX " WWIDMAX\n"
> + "MPATHa WWID0\n", -1);
> expect_condlog(0, NOMORE_STR);
> rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", check_if_taken);
> assert_int_equal(rc, -1);
> @@ -892,9 +874,8 @@ static void lb_nomatch_int_max_used(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHb WWID1\n");
> - will_return(__wrap_fgets, "MPATH" MPATH_ID_INT_MAX " WWIDMAX\n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHb WWID1\n"
> + "MPATH" MPATH_ID_INT_MAX " WWIDMAX\n", -1);
> mock_used_alias("MPATHa", "WWID2");
> expect_condlog(0, NOMORE_STR);
> rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", 1);
> @@ -907,10 +888,9 @@ static void lb_nomatch_int_max_m1(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHb WWID1\n");
> - 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_bindings_file("MPATHb WWID1\n"
> + "MPATH" MPATH_ID_INT_MAX_m1 " WWIDMAX\n"
> + "MPATHa WWID0\n", -1);
> expect_condlog(3, NOMATCH_WWID_STR("WWID2"));
> rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", 0);
> assert_int_equal(rc, INT_MAX);
> @@ -922,10 +902,9 @@ static void lb_nomatch_int_max_m1_used(void **state)
> int rc;
> char *alias;
>
> - will_return(__wrap_fgets, "MPATHb WWID1\n");
> - 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_bindings_file("MPATHb WWID1\n"
> + "MPATH" MPATH_ID_INT_MAX_m1 " WWIDMAX\n"
> + "MPATHa WWID0\n", -1);
> mock_used_alias("MPATH" MPATH_ID_INT_MAX, "WWID2");
> expect_condlog(0, NOMORE_STR);
> rc = lookup_binding(NULL, "WWID2", &alias, "MPATH", 1);
> @@ -938,9 +917,8 @@ static void lb_nomatch_int_max_m1_1_used(void **state)
> int rc;
> char *alias;
>
> - 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_bindings_file("MPATHb WWID1\n"
> + "MPATH" MPATH_ID_INT_MAX_m1 " WWIDMAX\n", -1);
> mock_used_alias("MPATHa", "WWID2");
> mock_unused_alias("MPATH" MPATH_ID_INT_MAX);
> expect_condlog(3, NOMATCH_WWID_STR("WWID2"));
> @@ -954,9 +932,8 @@ static void lb_nomatch_int_max_m1_2_used(void **state)
> int rc;
> char *alias;
>
> - 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_bindings_file("MPATHb WWID1\n"
> + "MPATH" MPATH_ID_INT_MAX_m1 " WWIDMAX\n", -1);
> mock_used_alias("MPATHa", "WWID2");
> mock_used_alias("MPATH" MPATH_ID_INT_MAX, "WWID2");
> expect_condlog(0, NOMORE_STR);
> @@ -1014,7 +991,7 @@ static void rl_empty(void **state)
> char buf[WWID_SIZE];
>
> buf[0] = '\0';
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("", -1);
> expect_condlog(3, NOMATCH_STR("MPATHa"));
> rc = rlookup_binding(NULL, buf, "MPATHa");
> assert_int_equal(rc, -1);
> @@ -1027,7 +1004,7 @@ static void rl_match_a(void **state)
> char buf[WWID_SIZE];
>
> buf[0] = '\0';
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> + mock_bindings_file("MPATHa WWID0\n", 0);
> expect_condlog(3, FOUND_ALIAS_STR("MPATHa", "WWID0"));
> rc = rlookup_binding(NULL, buf, "MPATHa");
> assert_int_equal(rc, 0);
> @@ -1040,8 +1017,7 @@ static void rl_nomatch_a(void **state)
> char buf[WWID_SIZE];
>
> buf[0] = '\0';
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHa WWID0\n", -1);
> expect_condlog(3, NOMATCH_STR("MPATHb"));
> rc = rlookup_binding(NULL, buf, "MPATHb");
> assert_int_equal(rc, -1);
> @@ -1054,8 +1030,7 @@ static void rl_malformed_a(void **state)
> char buf[WWID_SIZE];
>
> buf[0] = '\0';
> - will_return(__wrap_fgets, "MPATHa \n");
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("MPATHa \n", -1);
> expect_condlog(3, "Ignoring malformed line 1 in bindings file\n");
> expect_condlog(3, NOMATCH_STR("MPATHa"));
> rc = rlookup_binding(NULL, buf, "MPATHa");
> @@ -1074,8 +1049,7 @@ static void rl_overlong_a(void **state)
> snprintf(line + sizeof(line) - 2, 2, "\n");
>
> buf[0] = '\0';
> - will_return(__wrap_fgets, line);
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file(line, -1);
> expect_condlog(3, "Ignoring too large wwid at 1 in bindings file\n");
> expect_condlog(3, NOMATCH_STR("MPATHa"));
> rc = rlookup_binding(NULL, buf, "MPATHa");
> @@ -1089,9 +1063,9 @@ static void rl_match_b(void **state)
> char buf[WWID_SIZE];
>
> buf[0] = '\0';
> - will_return(__wrap_fgets, "MPATHa WWID0\n");
> - will_return(__wrap_fgets, "MPATHz WWID26\n");
> - will_return(__wrap_fgets, "MPATHb WWID2\n");
> + mock_bindings_file("MPATHa WWID0\n"
> + "MPATHz WWID26\n"
> + "MPATHb WWID2\n", 2);
> expect_condlog(3, FOUND_ALIAS_STR("MPATHb", "WWID2"));
> rc = rlookup_binding(NULL, buf, "MPATHb");
> assert_int_equal(rc, 0);
> @@ -1222,7 +1196,7 @@ static void gufa_empty_new_rw(void **state) {
>
> will_return(__wrap_open_file, true);
>
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("", -1);
> mock_unused_alias("MPATHa");
> expect_condlog(3, NOMATCH_WWID_STR("WWID0"));
>
> @@ -1235,7 +1209,7 @@ static void gufa_empty_new_rw(void **state) {
> static void gufa_empty_new_ro_1(void **state) {
> char *alias;
> will_return(__wrap_open_file, false);
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("", -1);
> mock_unused_alias("MPATHa");
> expect_condlog(3, NOMATCH_WWID_STR("WWID0"));
>
> @@ -1248,7 +1222,7 @@ static void gufa_empty_new_ro_2(void **state) {
>
> will_return(__wrap_open_file, true);
>
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("", -1);
> mock_unused_alias("MPATHa");
> expect_condlog(3, NOMATCH_WWID_STR("WWID0"));
>
> @@ -1261,7 +1235,7 @@ static void gufa_match_a_unused(void **state) {
>
> will_return(__wrap_open_file, true);
>
> - will_return(__wrap_fgets, BINDING_STR("MPATHa", "WWID0"));
> + mock_bindings_file("MPATHa WWID0", 0);
> expect_condlog(3, FOUND_STR("MPATHa", "WWID0"));
> mock_unused_alias("MPATHa");
>
> @@ -1275,7 +1249,7 @@ static void gufa_match_a_self(void **state) {
>
> will_return(__wrap_open_file, true);
>
> - will_return(__wrap_fgets, BINDING_STR("MPATHa", "WWID0"));
> + mock_bindings_file("MPATHa WWID0", 0);
> expect_condlog(3, FOUND_STR("MPATHa", "WWID0"));
> mock_self_alias("MPATHa", "WWID0");
>
> @@ -1289,7 +1263,7 @@ static void gufa_match_a_used(void **state) {
>
> will_return(__wrap_open_file, true);
>
> - will_return(__wrap_fgets, BINDING_STR("MPATHa", "WWID0"));
> + mock_bindings_file("MPATHa WWID0", 0);
> expect_condlog(3, FOUND_STR("MPATHa", "WWID0"));
> mock_used_alias("MPATHa", "WWID0");
>
> @@ -1389,11 +1363,11 @@ static void gufa_old_empty(void **state) {
> will_return(__wrap_open_file, true);
>
> /* rlookup_binding for ALIAS */
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("", -1);
> expect_condlog(3, NOMATCH_STR("MPATHz"));
>
> /* lookup_binding */
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("", -1);
> expect_condlog(3, NOMATCH_WWID_STR("WWID0"));
>
> mock_unused_alias("MPATHz");
> @@ -1410,10 +1384,10 @@ static void gufa_old_empty_self(void **state) {
> char *alias;
> will_return(__wrap_open_file, true);
>
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("", -1);
> expect_condlog(3, NOMATCH_STR("MPATHz"));
>
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("", -1);
> expect_condlog(3, NOMATCH_WWID_STR("WWID0"));
> mock_self_alias("MPATHz", "WWID0");
>
> @@ -1429,10 +1403,10 @@ static void gufa_old_empty_used(void **state) {
> char *alias;
> will_return(__wrap_open_file, true);
>
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("", -1);
> expect_condlog(3, NOMATCH_STR("MPATHz"));
>
> - will_return(__wrap_fgets, NULL);
> + mock_bindings_file("", -1);
> expect_condlog(3, NOMATCH_WWID_STR("WWID0"));
> mock_used_alias("MPATHz", "WWID0");
> expect_condlog(0, ERR_STR("MPATHz", "WWID0"));
> --
> 2.41.0
--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
next prev parent reply other threads:[~2023-09-06 22:44 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-01 18:02 [dm-devel] [PATCH 00/21] multipath-tools: user-friendly names rework mwilck
2023-09-01 18:02 ` [dm-devel] [PATCH 01/21] libmultipath: sysfs_set_scsi_tmo: do nothing for ACT_DRY_RUN mwilck
2023-09-06 22:42 ` Benjamin Marzinski
2023-09-01 18:02 ` [dm-devel] [PATCH 02/21] libmultipath: add alias_already_taken() mwilck
2023-09-06 22:42 ` Benjamin Marzinski
2023-09-01 18:02 ` [dm-devel] [PATCH 03/21] libmultipath: unify use_existing_alias() and get_user_friendly_alias() mwilck
2023-09-06 22:42 ` Benjamin Marzinski
2023-09-01 18:02 ` [dm-devel] [PATCH 04/21] libmultipath: never allocate an alias that's already taken mwilck
2023-09-06 22:42 ` Benjamin Marzinski
2023-09-07 7:24 ` Martin Wilck
2023-09-07 13:33 ` Martin Wilck
2023-09-07 14:22 ` Martin Wilck
2023-09-01 18:02 ` [dm-devel] [PATCH 05/21] libmultipath: lookup_binding: add comment about the algorithm mwilck
2023-09-06 22:43 ` Benjamin Marzinski
2023-09-07 8:22 ` Martin Wilck
2023-09-01 18:02 ` [dm-devel] [PATCH 06/21] multipath-tools test: simplify debugging for condlog mismatch mwilck
2023-09-06 22:43 ` Benjamin Marzinski
2023-09-01 18:02 ` [dm-devel] [PATCH 07/21] multipath-tools tests: add tests for get_user_friendly_alias() mwilck
2023-09-06 22:43 ` Benjamin Marzinski
2023-09-07 7:55 ` Martin Wilck
2023-09-01 18:02 ` [dm-devel] [PATCH 08/21] multipath-tools test: consistent use of macros in alias test mwilck
2023-09-06 22:43 ` Benjamin Marzinski
2023-09-01 18:02 ` [dm-devel] [PATCH 09/21] multipath-tools tests: convert mock_{failed, used}_alias to macros mwilck
2023-09-06 22:44 ` Benjamin Marzinski
2023-09-01 18:02 ` [dm-devel] [PATCH 10/21] multipath-tools test: use mock_bindings_file() consistently mwilck
2023-09-06 22:43 ` Benjamin Marzinski [this message]
2023-09-01 18:02 ` [dm-devel] [PATCH 11/21] libmultipath: add global variable for current bindings mwilck
2023-09-06 22:44 ` Benjamin Marzinski
2023-09-01 18:02 ` [dm-devel] [PATCH 12/21] libmultipath: rename fix_bindings_file() to update_bindings_file() mwilck
2023-09-06 22:44 ` Benjamin Marzinski
2023-09-01 18:02 ` [dm-devel] [PATCH 13/21] libmultipath: alias.c: move bindings related code up mwilck
2023-09-06 22:44 ` Benjamin Marzinski
2023-09-01 18:02 ` [dm-devel] [PATCH 14/21] libmultipath: update_bindings_file: take filename argument mwilck
2023-09-06 22:45 ` Benjamin Marzinski
2023-09-01 18:02 ` [dm-devel] [PATCH 15/21] libmultipath: update_bindings_file: use a single write() mwilck
2023-09-06 22:45 ` Benjamin Marzinski
2023-09-01 18:02 ` [dm-devel] [PATCH 16/21] libmultipath: update_bindings_file: don't log temp file name mwilck
2023-09-06 22:45 ` Benjamin Marzinski
2023-09-01 18:02 ` [dm-devel] [PATCH 17/21] libmultipath: alias.c: factor out read_binding() mwilck
2023-09-06 22:45 ` Benjamin Marzinski
2023-09-01 18:02 ` [dm-devel] [PATCH 18/21] libmultipath: keep bindings in memory mwilck
2023-09-06 22:47 ` Benjamin Marzinski
2023-09-07 10:30 ` Martin Wilck
2023-09-07 19:14 ` Benjamin Marzinski
2023-09-07 20:02 ` Benjamin Marzinski
2023-09-07 20:43 ` Martin Wilck
2023-09-08 17:22 ` Benjamin Marzinski
2023-09-11 6:25 ` Martin Wilck
2023-09-11 14:47 ` Benjamin Marzinski
2023-09-01 18:02 ` [dm-devel] [PATCH 19/21] multipath-tools tests: fix alias tests mwilck
2023-09-06 22:47 ` Benjamin Marzinski
2023-09-01 18:02 ` [dm-devel] [PATCH 20/21] libmultipath: dm_get_uuid(): return emtpy UUID for non-existing maps mwilck
2023-09-06 22:47 ` Benjamin Marzinski
2023-09-01 18:02 ` [dm-devel] [PATCH 21/21] libmultipath: adapt to new semantics of dm_get_uuid() mwilck
2023-09-06 22:47 ` Benjamin Marzinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230906224354.GT7412@octiron.msp.redhat.com \
--to=bmarzins@redhat.com \
--cc=dm-devel@redhat.com \
--cc=mwilck@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox