diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-09-30 19:55:22 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-09-30 20:02:36 -0400 |
| commit | e661d7fc6434872b249d6d6f51930b48cc738ef3 (patch) | |
| tree | a2fe94a3833b871201bf1209f40802ecd1de29cd | |
| parent | fd48bd9ddc6d957ca448ec0ff5a27d0e2ed8a9d9 (diff) | |
Fix hanging tests
bcachefs_antagonist kicks off child processes, thus causes wait to hang
| -rw-r--r-- | tests/bcachefs/subvol.ktest | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/bcachefs/subvol.ktest b/tests/bcachefs/subvol.ktest index 332e91d..d579992 100644 --- a/tests/bcachefs/subvol.ktest +++ b/tests/bcachefs/subvol.ktest @@ -22,7 +22,6 @@ test_snapshots_simple() bcachefs subvolume snapshot snap-$i done popd - exit for i in `seq 0 $NR_SNAPS|sort -r`; do umount /mnt @@ -43,9 +42,10 @@ test_snapshots_simple() test_snapshots_dbench() { - NR_SNAPS=10 + # so wait doesn't hang + [[ $(jobs -p) != "" ]] && kill $(jobs -p) - bcachefs_antagonist + NR_SNAPS=10 run_quiet "" bcachefs format -f --errors=panic /dev/sdb mount -t bcachefs /dev/sdb /mnt @@ -84,7 +84,8 @@ test_snapshots_dbench() test_snapshots_fio() { - bcachefs_antagonist + # so wait doesn't hang + [[ $(jobs -p) != "" ]] && kill $(jobs -p) run_quiet "" bcachefs format -f --errors=panic /dev/sdb mount -t bcachefs /dev/sdb /mnt @@ -235,4 +236,3 @@ test_subvol_delete_snapshot_of_deleted_subvol() umount /mnt } - |