diff --git a/tests/golden/offline-extent-waiting b/tests/golden/offline-extent-waiting index 9ea47d4f..7fcd8f19 100644 --- a/tests/golden/offline-extent-waiting +++ b/tests/golden/offline-extent-waiting @@ -49,7 +49,7 @@ offline wating should be empty: 0 == truncating does wait truncate should be waiting for first block: -trunate should no longer be waiting: +truncate should no longer be waiting: 0 == writing waits should be waiting for write diff --git a/tests/tests/offline-extent-waiting.sh b/tests/tests/offline-extent-waiting.sh index 31b04b59..dda3b7d4 100644 --- a/tests/tests/offline-extent-waiting.sh +++ b/tests/tests/offline-extent-waiting.sh @@ -157,7 +157,7 @@ echo "truncate should be waiting for first block:" expect_wait "$DIR/file" "change_size" $ino 0 scoutfs stage "$DIR/golden" "$DIR/file" -V "$vers" -o 0 -l $BYTES sleep .1 -echo "trunate should no longer be waiting:" +echo "truncate should no longer be waiting:" scoutfs data-waiting -B 0 -I 0 -p "$DIR" | wc -l cat "$DIR/golden" > "$DIR/file" vers=$(scoutfs stat -s data_version "$DIR/file") @@ -168,10 +168,13 @@ scoutfs release "$DIR/file" -V "$vers" -o 0 -l $BYTES # overwrite, not truncate+write dd if="$DIR/other" of="$DIR/file" \ bs=$BS count=$BLOCKS conv=notrunc status=none & +pid="$!" sleep .1 echo "should be waiting for write" expect_wait "$DIR/file" "write" $ino 0 scoutfs stage "$DIR/golden" "$DIR/file" -V "$vers" -o 0 -l $BYTES +# wait for the background dd to complete +wait "$pid" 2> /dev/null cmp "$DIR/file" "$DIR/other" echo "== cleanup"