Same fix as in 6a7524a ("multipath-tools tests: fix CI failures on arm/v7 with
glibc 2.37").
Signed-off-by: Martin Wilck <mwilck@xxxxxxxx>
Reviewed-by: Benjamin Marzinski <bmarzins@xxxxxxxxxx>
---
tests/dmevents.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/tests/dmevents.c b/tests/dmevents.c
index 395b16d..668e6d2 100644
--- a/tests/dmevents.c
+++ b/tests/dmevents.c
@@ -253,8 +253,9 @@ int __wrap_dm_geteventnr(const char *name)
return -1;
}
-int __wrap_ioctl(int fd, unsigned long request, void *argp)
+int WRAP_IOCTL(int fd, unsigned long request, void *argp)
{
+ condlog(1, "%s %ld", __func__, request);
assert_int_equal(fd, waiter->fd);
assert_int_equal(request, DM_DEV_ARM_POLL);
return mock_type(int);
@@ -675,7 +676,7 @@ static void test_dmevent_loop_bad1(void **state)
skip();
will_return(__wrap_poll, 1);
- will_return(__wrap_ioctl, -1);
+ wrap_will_return(WRAP_IOCTL, -1);
assert_int_equal(dmevent_loop(), 1);
dev_evt = find_dmevents("foo");
assert_ptr_not_equal(dev_evt, NULL);
@@ -697,7 +698,7 @@ static void test_dmevent_loop_bad2(void **state)
skip();
will_return(__wrap_poll, 1);
- will_return(__wrap_ioctl, 0);
+ wrap_will_return(WRAP_IOCTL, 0);
will_return(__wrap_libmp_dm_task_create, NULL);
assert_int_equal(dmevent_loop(), 1);
dev_evt = find_dmevents("foo");
@@ -721,9 +722,8 @@ static void test_dmevent_loop_good0(void **state)
remove_all_dm_device_events();
unwatch_all_dmevents();
will_return(__wrap_poll, 1);
- will_return(__wrap_ioctl, 0);
+ wrap_will_return(WRAP_IOCTL, 0);
will_return(__wrap_libmp_dm_task_create, &data);
- will_return(__wrap_dm_task_no_open_count, 1);
will_return(__wrap_dm_task_run, 1);
will_return(__wrap_dm_task_get_names, 1);
assert_int_equal(dmevent_loop(), 1);
@@ -757,9 +757,8 @@ static void test_dmevent_loop_good1(void **state)
assert_int_equal(add_dm_device_event("foo", 1, 6), 0);
assert_int_equal(remove_dm_device_event("xyzzy"), 0);
will_return(__wrap_poll, 1);
- will_return(__wrap_ioctl, 0);
+ wrap_will_return(WRAP_IOCTL, 0);
will_return(__wrap_libmp_dm_task_create, &data);
- will_return(__wrap_dm_task_no_open_count, 1);
will_return(__wrap_dm_task_run, 1);
will_return(__wrap_dm_task_get_names, 1);
expect_string(__wrap_update_multipath, mapname, "foo");
@@ -805,9 +804,8 @@ static void test_dmevent_loop_good2(void **state)
assert_int_equal(watch_dmevents("baz"), 0);
assert_int_equal(add_dm_device_event("baz", 1, 14), 0);
will_return(__wrap_poll, 1);
- will_return(__wrap_ioctl, 0);
+ wrap_will_return(WRAP_IOCTL, 0);
will_return(__wrap_libmp_dm_task_create, &data);
- will_return(__wrap_dm_task_no_open_count, 1);
will_return(__wrap_dm_task_run, 1);
will_return(__wrap_dm_task_get_names, 1);
expect_string(__wrap_update_multipath, mapname, "bar");
@@ -849,9 +847,8 @@ static void test_dmevent_loop_good3(void **state)
assert_int_equal(remove_dm_device_event("foo"), 0);
unwatch_dmevents("bar");
will_return(__wrap_poll, 1);
- will_return(__wrap_ioctl, 0);
+ wrap_will_return(WRAP_IOCTL, 0);
will_return(__wrap_libmp_dm_task_create, &data);
- will_return(__wrap_dm_task_no_open_count, 1);
will_return(__wrap_dm_task_run, 1);
will_return(__wrap_dm_task_get_names, 1);
expect_string(__wrap_remove_map_by_alias, alias, "foo");
@@ -874,7 +871,7 @@ static void test_arm_poll(void **state)
struct test_data *datap = (struct test_data *)(*state);
if (datap == NULL)
skip();
- will_return(__wrap_ioctl, 0);
+ wrap_will_return(WRAP_IOCTL, 0);
assert_int_equal(arm_dm_event_poll(waiter->fd), 0);
}
--
2.45.2
