From 99a20bc3832296e0df59b2caae441e063b8a939f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 14 Mar 2023 14:58:48 -0700 Subject: [PATCH] Put scratch mount point in test tmp dirs Some tests had grown a bad pattern of making a mount point for the scratch mount in the root /mnt directory. Change them to use a mount point in their test's temp directory outside the testing fs. Signed-off-by: Zach Brown --- tests/tests/basic-bad-mounts.sh | 2 +- tests/tests/enospc.sh | 2 +- tests/tests/resize-devices.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/tests/basic-bad-mounts.sh b/tests/tests/basic-bad-mounts.sh index f7bd80c8..b8710b04 100644 --- a/tests/tests/basic-bad-mounts.sh +++ b/tests/tests/basic-bad-mounts.sh @@ -12,7 +12,7 @@ mount_fail() } echo "== prepare devices, mount point, and logs" -SCR="/mnt/scoutfs.extra" +SCR="$T_TMPDIR/mnt.scratch" mkdir -p "$SCR" > $T_TMP.mount.out scoutfs mkfs -f -Q 0,127.0.0.1,53000 "$T_EX_META_DEV" "$T_EX_DATA_DEV" > $T_TMP.mkfs.out 2>&1 \ diff --git a/tests/tests/enospc.sh b/tests/tests/enospc.sh index ab042479..277bfae0 100644 --- a/tests/tests/enospc.sh +++ b/tests/tests/enospc.sh @@ -59,7 +59,7 @@ echo "== make small meta fs" # meta device just big enough for reserves and the metadata we'll fill scoutfs mkfs -A -f -Q 0,127.0.0.1,53000 -m 10G "$T_EX_META_DEV" "$T_EX_DATA_DEV" > $T_TMP.mkfs.out 2>&1 || \ t_fail "mkfs failed" -SCR="/mnt/scoutfs.enospc" +SCR="$T_TMPDIR/mnt.scratch" mkdir -p "$SCR" mount -t scoutfs -o metadev_path=$T_EX_META_DEV,quorum_slot_nr=0 \ "$T_EX_DATA_DEV" "$SCR" diff --git a/tests/tests/resize-devices.sh b/tests/tests/resize-devices.sh index 9bd91476..cf7adb67 100644 --- a/tests/tests/resize-devices.sh +++ b/tests/tests/resize-devices.sh @@ -73,7 +73,7 @@ echo "== make initial small fs" scoutfs mkfs -A -f -Q 0,127.0.0.1,53000 -m $quarter_meta -d $quarter_data \ "$T_EX_META_DEV" "$T_EX_DATA_DEV" > $T_TMP.mkfs.out 2>&1 || \ t_fail "mkfs failed" -SCR="/mnt/scoutfs.enospc" +SCR="$T_TMPDIR/mnt.scratch" mkdir -p "$SCR" mount -t scoutfs -o metadev_path=$T_EX_META_DEV,quorum_slot_nr=0 \ "$T_EX_DATA_DEV" "$SCR"