From: Benjamin Marzinski <bmarzins@redhat.com>
To: mwilck@suse.com
Cc: dm-devel@redhat.com
Subject: Re: [dm-devel] [PATCH 09/21] multipath-tools tests: convert mock_{failed, used}_alias to macros
Date: Wed, 6 Sep 2023 17:44:12 -0500 [thread overview]
Message-ID: <20230906224412.GU7412@octiron.msp.redhat.com> (raw)
In-Reply-To: <20230901180235.23980-10-mwilck@suse.com>
On Fri, Sep 01, 2023 at 08:02:22PM +0200, mwilck@suse.com wrote:
> From: Martin Wilck <mwilck@suse.com>
>
> This way we can further improve readability of the individual test
> cases.
>
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
> Signed-off-by: Martin Wilck <mwilck@suse.com>
> ---
> 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
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 [this message]
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
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=20230906224412.GU7412@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