summaryrefslogtreecommitdiffstats
path: root/tests/24raid10deadlock
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2025-01-14 10:28:57 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2025-01-14 10:28:57 +0000
commit1d7738aaaf36152d633273c2fc622b7beb64c482 (patch)
treef0ddcd830491109d4788cd99248e3c04c82a57b3 /tests/24raid10deadlock
parentReleasing debian version 4.3+20241202-1.1. (diff)
downloadmdadm-1d7738aaaf36152d633273c2fc622b7beb64c482.tar.xz
mdadm-1d7738aaaf36152d633273c2fc622b7beb64c482.zip
Merging upstream version 4.4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/24raid10deadlock')
-rw-r--r--tests/24raid10deadlock4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/24raid10deadlock b/tests/24raid10deadlock
index ee330aa..9a3b80b 100644
--- a/tests/24raid10deadlock
+++ b/tests/24raid10deadlock
@@ -54,7 +54,7 @@ clean_up_test()
kill -9 $pid
kill -9 $action_pid
- sleep 1
+ sleep 2
if ps $action_pid | tail -1 | awk '{print $3}' | grep D; then
die "thread that is writing sysfs is stuck in D state, deadlock is triggered"
@@ -62,7 +62,7 @@ clean_up_test()
mdadm -S $md0
}
-cat /sys/kernel/debug/fail_make_request/times || die "fault injection is not enabled"
+cat /sys/kernel/debug/fail_make_request/times || skip "fault injection is not enabled"
trap 'clean_up_test' EXIT