Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix snapshot block device path in tests #81

Merged
merged 1 commit into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/1000-simple.sh
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ check_files ${MOUNTPOINT_1}
echo "Check snapshots"
IMAGE_1=${TESTDIR}/image0
mkdir -p ${IMAGE_1}
mount /dev/veeamblksnap-image0 ${IMAGE_1}
mount /dev/veeamblksnapimg0 ${IMAGE_1}
check_files ${IMAGE_1}

echo "Write to snapshot"
generate_files ${IMAGE_1} "snapshot" 3

drop_cache
umount /dev/veeamblksnap-image0
mount /dev/veeamblksnap-image0 ${IMAGE_1}
umount /dev/veeamblksnapimg0
mount /dev/veeamblksnapimg0 ${IMAGE_1}

check_files ${IMAGE_1}

Expand Down
2 changes: 1 addition & 1 deletion tests/2000-stretch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ echo "Check snapshot before overflow."

IMAGE_1=${MPDIR}/image0
mkdir -p ${IMAGE_1}
mount /dev/veeamblksnap-image0 ${IMAGE_1}
mount /dev/veeamblksnapimg0 ${IMAGE_1}
check_files ${IMAGE_1}

echo "Try to make snapshot overflow."
Expand Down
4 changes: 2 additions & 2 deletions tests/4000-diff_storage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ IMAGE=${MP_DIR}/image0
mkdir -p ${IMAGE}

echo "Mount image"
mount /dev/veeamblksnap-image0 ${IMAGE}
mount /dev/veeamblksnapimg0 ${IMAGE}
# for XFS filesystem nouuid option needed
#mount -o nouuid /dev/veeamblksnap-image0 ${IMAGE}
#mount -o nouuid /dev/veeamblksnapimg0 ${IMAGE}

check_files ${IMAGE}/${RELATIVE_TEST_DIR}

Expand Down
6 changes: 3 additions & 3 deletions tests/5000-pullout.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,15 @@ check_files ${MOUNTPOINT_1}
echo "Check snapshots"
IMAGE_1=${TESTDIR}/image0
mkdir -p ${IMAGE_1}
mount /dev/veeamblksnap-image0 ${IMAGE_1}
mount /dev/veeamblksnapimg0 ${IMAGE_1}
check_files ${IMAGE_1}

echo "Write to snapshot"
generate_files ${IMAGE_1} "snapshot" 3

drop_cache
umount /dev/veeamblksnap-image0
mount /dev/veeamblksnap-image0 ${IMAGE_1}
umount /dev/veeamblksnapimg0
mount /dev/veeamblksnapimg0 ${IMAGE_1}

check_files ${IMAGE_1}

Expand Down
4 changes: 2 additions & 2 deletions tests/6000-snapimage_write.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ else
END="$2"
fi

IMAGEDEVICE=/dev/veeamblksnap-image0
IMAGEMOUNTPOINT=/mnt/veeamblksnap-image0
IMAGEDEVICE=/dev/veeamblksnapimg0
IMAGEMOUNTPOINT=/mnt/veeamblksnapimg0
mkdir -p ${IMAGEMOUNTPOINT}

DIFF_STORAGE="${MOUNTPOINT}/diff_storage/"
Expand Down
2 changes: 1 addition & 1 deletion tests/simpleTest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ echo "STORE_UUID: $STORE_UUID"
SNAP_ID=$(./blksnap create-snapshot --device $SRC_DEVICE --store $STORE_UUID)
echo "SNAP_ID: $SNAP_ID"

mount "/dev/veeamblksnap-image0" $DST_MOUNT_DIR
mount "/dev/veeamblksnapimg0" $DST_MOUNT_DIR
SNAPSHOT_SHA=$(sha1sum "$DST_MOUNT_DIR/test_file")
echo "ORIGINAL_SHA: $ORIGINAL_SHA"
echo "SNAPSHOT_SHA: $SNAPSHOT_SHA"
Expand Down