Skip to content

Commit

Permalink
test(BTRFSRAID): make the test more reliable
Browse files Browse the repository at this point in the history
Currently the test sometimes fails with the following error message:

Dependency failed for systemd-fsck…m Check on /dev/disk/by-label/root.
  • Loading branch information
jozzsi authored and LaszloGombos committed Nov 10, 2024
1 parent 8b71a80 commit 1893992
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions test/TEST-24-BTRFSRAID/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ test_run() {
test_marker_reset
"$testdir"/run-qemu \
"${disk_args[@]}" \
-append "$TEST_KERNEL_CMDLINE root=LABEL=root" \
-append "$TEST_KERNEL_CMDLINE root=LABEL=root ro" \
-initrd "$TESTDIR"/initramfs.testing
test_marker_check || return 1
}
Expand All @@ -41,8 +41,7 @@ test_setup() {
# devices, volume groups, encrypted partitions, etc.
"$DRACUT" -N -i "$TESTDIR"/overlay / \
--add-confdir test-makeroot \
-a "bash btrfs" \
-d "piix ide-gd_mod ata_piix btrfs sd_mod" \
-d "btrfs piix ide-gd_mod ata_piix btrfs sd_mod" \
-I "mkfs.btrfs" \
-i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
-f "$TESTDIR"/initramfs.makeroot "$KVERSION" || return 1
Expand All @@ -64,7 +63,7 @@ test_setup() {

test_marker_check dracut-root-block-created || return 1

test_dracut \
test_dracut --nofscks \
-d "btrfs" \
"$TESTDIR"/initramfs.testing
}
Expand Down

0 comments on commit 1893992

Please sign in to comment.