Skip to content

Commit ca45b61

Browse files
committed
fixup! add tests
1 parent e2a062a commit ca45b61

2 files changed

Lines changed: 37 additions & 30 deletions

File tree

‎tests/test_control.cpp‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,24 @@ TEST_CASE("test control") {
6767
}
6868

6969
SUBCASE("del_dev_async") {
70-
// Hold dev reference
71-
auto ublkc_path = ublk::detail::dev_path(dev_id);
72-
int ublkc_fd = open(ublkc_path.c_str(), O_RDWR);
73-
auto d = ublk::detail::defer([&]() noexcept { close(ublkc_fd); });
70+
// TODO: Kernel bug
71+
// https://lore.kernel.org/linux-block/20260901142438.237586-1-yi1tang.yang@gmail.com/
72+
if (!unprivileged) {
73+
// Hold dev reference
74+
auto ublkc_path = ublk::detail::dev_path(dev_id);
75+
int ublkc_fd = open(ublkc_path.c_str(), O_RDWR);
76+
auto d =
77+
ublk::detail::defer([&]() noexcept { close(ublkc_fd); });
7478

75-
try {
76-
ex::sync_wait(ex::starts_on(
77-
sched, ublk::del_dev_async(control_fd, dev_id)));
78-
} catch (const std::system_error &e) {
79-
if (e.code().value() != EOPNOTSUPP) {
80-
throw;
79+
try {
80+
ex::sync_wait(ex::starts_on(
81+
sched, ublk::del_dev_async(control_fd, dev_id)));
82+
} catch (const std::system_error &e) {
83+
if (e.code().value() != EOPNOTSUPP) {
84+
throw;
85+
}
86+
MESSAGE("del_dev_async not supported, skipping");
8187
}
82-
MESSAGE("del_dev_async not supported, skipping");
8388
}
8489
}
8590

‎tests/test_raw.cpp‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -404,25 +404,27 @@ TEST_CASE("test raw - unprivileged") {
404404
ex::upon_error([](std::error_code) noexcept {})));
405405
});
406406

407-
SUBCASE("del_dev_async") {
408-
// Hold dev reference
409-
auto ublkc_path = ublk::detail::dev_path(dev_id);
410-
int ublkc_fd = open(ublkc_path.c_str(), O_RDWR);
411-
auto d = ublk::detail::defer([&]() noexcept { close(ublkc_fd); });
412-
413-
try {
414-
ex::sync_wait(ex::starts_on(
415-
sched,
416-
ublk::raw::del_dev_async(control_fd, dev_id, dev_path,
417-
sizeof(dev_path))));
418-
} catch (const std::system_error &e) {
419-
if (e.code().value() != EOPNOTSUPP) {
420-
throw;
421-
}
422-
MESSAGE("del_dev_async not supported, skipping");
423-
return;
424-
}
425-
}
407+
// TODO: Kernel bug
408+
// https://lore.kernel.org/linux-block/20260901142438.237586-1-yi1tang.yang@gmail.com/
409+
// SUBCASE("del_dev_async") {
410+
// // Hold dev reference
411+
// auto ublkc_path = ublk::detail::dev_path(dev_id);
412+
// int ublkc_fd = open(ublkc_path.c_str(), O_RDWR);
413+
// auto d = ublk::detail::defer([&]() noexcept { close(ublkc_fd); });
414+
415+
// try {
416+
// ex::sync_wait(ex::starts_on(
417+
// sched,
418+
// ublk::raw::del_dev_async(control_fd, dev_id, dev_path,
419+
// sizeof(dev_path))));
420+
// } catch (const std::system_error &e) {
421+
// if (e.code().value() != EOPNOTSUPP) {
422+
// throw;
423+
// }
424+
// MESSAGE("del_dev_async not supported, skipping");
425+
// return;
426+
// }
427+
// }
426428

427429
SUBCASE("get_queue_affinity") {
428430
ublk::detail::DevPathBuf<cpu_set_t> aff_buf(dev_id);

0 commit comments

Comments
 (0)