summaryrefslogtreecommitdiffstats
path: root/tests/24raid10deadlock
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2025-01-14 10:28:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2025-01-14 10:28:53 +0000
commit929a7f35226e61f7d108b6eda9e5fefdb844fbe3 (patch)
treef1c5b4f62cca05bd101d32f5f168cd3b446d2bc7 /tests/24raid10deadlock
parentAdding upstream version 4.3+20241202. (diff)
downloadmdadm-929a7f35226e61f7d108b6eda9e5fefdb844fbe3.tar.xz
mdadm-929a7f35226e61f7d108b6eda9e5fefdb844fbe3.zip
Adding upstream version 4.4.upstream/4.4upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--tests/24raid10deadlock4
-rw-r--r--tests/24raid10deadlock.inject_error0
2 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
diff --git a/tests/24raid10deadlock.inject_error b/tests/24raid10deadlock.inject_error
deleted file mode 100644
index e69de29..0000000
--- a/tests/24raid10deadlock.inject_error
+++ /dev/null