c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-26 04:07:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

tests: don't >-redirect without eval

Browse Source 
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13259
This commit is contained in:
наб
2022-03-09 13:39:34 +01:00
committed by Brian Behlendorf
parent 053dac9e7d
commit 62c5ccdf92
51 changed files with 190 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/zfs-tests/tests/functional/snapshot/clone_001_pos.ksh
+1 -2
View File
@@ -113,8 +113,7 @@ log_onexit cleanup_all
setup_all
[[ -n $TESTDIR ]] && \
log_must rm -rf $TESTDIR/* > /dev/null 2>&1
[ -n $TESTDIR ] && log_must rm -rf $TESTDIR/*
typeset -i COUNT=10
typeset -i i=0
tests/zfs-tests/tests/functional/snapshot/rollback_001_pos.ksh
+2 -4
View File
@@ -55,16 +55,14 @@ function cleanup
[[ $? -eq 0 ]] && \
log_must zfs destroy $SNAPFS
[[ -e $TESTDIR ]] && \
log_must rm -rf $TESTDIR/* > /dev/null 2>&1
[ -e $TESTDIR ] && log_must rm -rf $TESTDIR/*
}
log_assert "Verify that a rollback to a previous snapshot succeeds."
log_onexit cleanup
[[ -n $TESTDIR ]] && \
log_must rm -rf $TESTDIR/* > /dev/null 2>&1
[ -n $TESTDIR ] && log_must rm -rf $TESTDIR/*
typeset -i COUNT=10
tests/zfs-tests/tests/functional/snapshot/rollback_002_pos.ksh
+3 -6
View File
@@ -59,16 +59,14 @@ function cleanup
[[ $? -eq 0 ]] && \
log_must zfs destroy $SNAPFS
[[ -e $TESTDIR ]] && \
log_must rm -rf $TESTDIR/* > /dev/null 2>&1
[ -e $TESTDIR ] && log_must rm -rf $TESTDIR/*
}
log_assert "Verify rollback is with respect to latest snapshot."
log_onexit cleanup
[[ -n $TESTDIR ]] && \
log_must rm -rf $TESTDIR/* > /dev/null 2>&1
[ -n $TESTDIR ] && log_must rm -rf $TESTDIR/*
typeset -i COUNT=10
@@ -109,8 +107,7 @@ while [[ $i -le $COUNT ]]; do
(( i = i + 1 ))
done
[[ -n $TESTDIR ]] && \
log_must rm -rf $TESTDIR/original_file* > /dev/null 2>&1
[ -n $TESTDIR ] && log_must rm -f $TESTDIR/original_file*
#
# Now rollback to latest snapshot
tests/zfs-tests/tests/functional/snapshot/rollback_003_pos.ksh
+2 -2
View File
@@ -100,7 +100,7 @@ log_must zfs snapshot $SNAPPOOL.1
#
# https://github.com/openzfs/zfs/issues/6143
#
log_must df >/dev/null
log_must eval "df >/dev/null"
export __ZFS_POOL_RESTRICT="$TESTPOOL"
log_must zfs unmount -a
@@ -110,6 +110,6 @@ unset __ZFS_POOL_RESTRICT
log_must touch /$TESTPOOL/$TESTFILE/$TESTFILE.1
log_must zfs rollback $SNAPPOOL.1
log_must df >/dev/null
log_must eval "df >/dev/null"
log_pass "Rollbacks succeed when nested file systems are present."
tests/zfs-tests/tests/functional/snapshot/snapshot_001_pos.ksh
+1 -1
View File
@@ -54,7 +54,7 @@ function cleanup
log_must zfs destroy $SNAPFS
fi
log_must rm -rf $SNAPDIR $TESTDIR/* > /dev/null 2>&1
log_must rm -rf $SNAPDIR $TESTDIR/*
}
log_assert "Verify a file system snapshot is identical to original."
tests/zfs-tests/tests/functional/snapshot/snapshot_002_pos.ksh
+15 -30
View File
@@ -51,26 +51,13 @@ verify_runnable "both"
function cleanup
{
if [[ -d $CWD ]]; then
cd $CWD || log_fail "Could not cd $CWD"
fi
[ -d $CWD ] && log_must cd $CWD
snapexists $SNAPFS
if [[ $? -eq 0 ]]; then
log_must zfs destroy $SNAPFS
fi
snapexists $SNAPFS && log_must zfs destroy $SNAPFS
if [[ -e $SNAPDIR ]]; then
log_must rm -rf $SNAPDIR > /dev/null 2>&1
fi
if [[ -e $TESTDIR ]]; then
log_must rm -rf $TESTDIR/* > /dev/null 2>&1
fi
if [[ -d "$SNAPSHOT_TARDIR" ]]; then
log_must rm -rf $SNAPSHOT_TARDIR > /dev/null 2>&1
fi
[ -e $SNAPDIR ] && log_must rm -rf $SNAPDIR
[ -e $TESTDIR ] && log_must rm -rf $TESTDIR/*
[ -d "$SNAPSHOT_TARDIR" ] && log_must rm -rf $SNAPSHOT_TARDIR
}
log_assert "Verify an archive of a file system is identical to " \
@@ -82,8 +69,7 @@ log_onexit cleanup
typeset -i COUNT=21
typeset OP=create
[[ -n $TESTDIR ]] && \
rm -rf $TESTDIR/* > /dev/null 2>&1
[ -n $TESTDIR ] && rm -rf $TESTDIR/*
log_note "Create files in the zfs filesystem..."
@@ -96,33 +82,32 @@ done
log_note "Create a tarball from $TESTDIR contents..."
CWD=$PWD
cd $TESTDIR || log_fail "Could not cd $TESTDIR"
log_must cd $TESTDIR
log_must tar cf $SNAPSHOT_TARDIR/original.tar .
cd $CWD || log_fail "Could not cd $CWD"
log_must cd $CWD
log_note "Create a snapshot and mount it..."
log_must zfs snapshot $SNAPFS
log_note "Remove all of the original files..."
log_must rm -f $TESTDIR/file* > /dev/null 2>&1
log_must rm -f $TESTDIR/file*
log_note "Create tarball of snapshot..."
CWD=$PWD
cd $SNAPDIR || log_fail "Could not cd $SNAPDIR"
log_must cd $SNAPDIR
log_must tar cf $SNAPSHOT_TARDIR/snapshot.tar .
cd $CWD || log_fail "Could not cd $CWD"
log_must cd $CWD
log_must mkdir $TESTDIR/original
log_must mkdir $TESTDIR/snapshot
log_must mkdir $TESTDIR/original $TESTDIR/snapshot
CWD=$PWD
cd $TESTDIR/original || log_fail "Could not cd $TESTDIR/original"
log_must cd $TESTDIR/original
log_must tar xf $SNAPSHOT_TARDIR/original.tar
cd $TESTDIR/snapshot || log_fail "Could not cd $TESTDIR/snapshot"
log_must cd $TESTDIR/snapshot
log_must tar xf $SNAPSHOT_TARDIR/snapshot.tar
cd $CWD || log_fail "Could not cd $CWD"
log_must cd $CWD
log_must directory_diff $TESTDIR/original $TESTDIR/snapshot
log_pass "Directory structures match."
tests/zfs-tests/tests/functional/snapshot/snapshot_003_pos.ksh
+7 -12
View File
@@ -49,20 +49,17 @@ function cleanup
{
typeset -i i=1
while [ $i -lt $COUNT ]; do
snapexists $SNAPFS.$i
if [[ $? -eq 0 ]]; then
log_must zfs destroy $SNAPFS.$i
fi
snapexists $SNAPFS.$i && log_must zfs destroy $SNAPFS.$i
if [[ -e $SNAPDIR.$i ]]; then
log_must rm -rf $SNAPDIR.$i > /dev/null 2>&1
if [ -e $SNAPDIR.$i ]; then
log_must rm -rf $SNAPDIR.$i
fi
(( i = i + 1 ))
done
if [[ -e $TESTDIR ]]; then
log_must rm -rf $TESTDIR/* > /dev/null 2>&1
if [ -e $TESTDIR ]; then
log_must rm -rf $TESTDIR/*
fi
}
@@ -70,8 +67,7 @@ log_assert "Verify many snapshots of a file system can be taken."
log_onexit cleanup
[[ -n $TESTDIR ]] && \
log_must rm -rf $TESTDIR/* > /dev/null 2>&1
[ -n $TESTDIR ] && log_must rm -rf $TESTDIR/*
typeset -i COUNT=10
@@ -86,8 +82,7 @@ while [[ $i -lt $COUNT ]]; do
done
log_note "Remove all of the original files"
[[ -n $TESTDIR ]] && \
log_must rm -rf $TESTDIR/file* > /dev/null 2>&1
[ -n $TESTDIR ] && log_must rm -rf $TESTDIR/file*
i=1
while [[ $i -lt $COUNT ]]; do
tests/zfs-tests/tests/functional/snapshot/snapshot_004_pos.ksh
+3 -7
View File
@@ -48,20 +48,16 @@ verify_runnable "both"
function cleanup
{
snapexists $SNAPFS
[[ $? -eq 0 ]] && \
log_must zfs destroy $SNAPFS
snapexists $SNAPFS && log_must zfs destroy $SNAPFS
[[ -e $TESTDIR ]] && \
log_must rm -rf $TESTDIR/* > /dev/null 2>&1
[ -e $TESTDIR ] && log_must rm -rf $TESTDIR/*
}
log_assert "Verify that a snapshot of an empty file system remains empty."
log_onexit cleanup
[[ -n $TESTDIR ]] && \
log_must rm -rf $TESTDIR/* > /dev/null 2>&1
[ -n $TESTDIR ] && log_must rm -rf $TESTDIR/*
log_must zfs snapshot $SNAPFS
FILE_COUNT=`ls -Al $SNAPDIR | grep -v "total 0" | wc -l`
tests/zfs-tests/tests/functional/snapshot/snapshot_005_pos.ksh
+6 -9
View File
@@ -49,17 +49,14 @@ verify_runnable "both"
function cleanup
{
snapexists $SNAPCTR
if [[ $? -eq 0 ]]; then
log_must zfs destroy $SNAPCTR
snapexists $SNAPCTR && log_must zfs destroy $SNAPCTR
if [ -e $SNAPDIR1 ]; then
log_must rm -rf $SNAPDIR1
fi
if [[ -e $SNAPDIR1 ]]; then
log_must rm -rf $SNAPDIR1 > /dev/null 2>&1
fi
if [[ -e $TESTDIR ]]; then
log_must rm -rf $TESTDIR/* > /dev/null 2>&1
if [ -e $TESTDIR ]; then
log_must rm -rf $TESTDIR/*
fi
}
tests/zfs-tests/tests/functional/snapshot/snapshot_006_pos.ksh
+19 -23
View File
@@ -51,24 +51,21 @@ verify_runnable "both"
function cleanup
{
if [[ -d $CWD ]]; then
cd $CWD || log_fail "Could not cd $CWD"
log_must cd $CWD
fi
snapexists $SNAPCTR
if [[ $? -eq 0 ]]; then
log_must zfs destroy $SNAPCTR
snapexists $SNAPCTR && log_must zfs destroy $SNAPCTR
if [ -e $SNAPDIR1 ]; then
log_must rm -rf $SNAPDIR1
fi
if [[ -e $SNAPDIR1 ]]; then
log_must rm -rf $SNAPDIR1 > /dev/null 2>&1
if [ -e $TESTDIR1 ]; then
log_must rm -rf $TESTDIR1/*
fi
if [[ -e $TESTDIR1 ]]; then
log_must rm -rf $TESTDIR1/* > /dev/null 2>&1
fi
if [[ -d "$SNAPSHOT_TARDIR" ]]; then
log_must rm -rf $SNAPSHOT_TARDIR > /dev/null 2>&1
if [ -d "$SNAPSHOT_TARDIR" ]; then
log_must rm -rf $SNAPSHOT_TARDIR
fi
}
@@ -81,7 +78,7 @@ log_onexit cleanup
typeset -i COUNT=21
typeset OP=create
[[ -n $TESTDIR1 ]] && rm -rf $TESTDIR1/* > /dev/null 2>&1
[ -n $TESTDIR1 ] && rm -rf $TESTDIR1/*
log_note "Create files in the zfs dataset ..."
@@ -94,33 +91,32 @@ done
log_note "Create a tarball from $TESTDIR1 contents..."
CWD=$PWD
cd $TESTDIR1 || log_fail "Could not cd $TESTDIR1"
log_must cd $TESTDIR1
log_must tar cf $SNAPSHOT_TARDIR/original.tar .
cd $CWD || log_fail "Could not cd $CWD"
log_must cd $CWD
log_note "Create a snapshot and mount it..."
log_must zfs snapshot $SNAPCTR
log_note "Remove all of the original files..."
log_must rm -f $TESTDIR1/file* > /dev/null 2>&1
log_must rm -f $TESTDIR1/file*
log_note "Create tarball of snapshot..."
CWD=$PWD
cd $SNAPDIR1 || log_fail "Could not cd $SNAPDIR1"
log_must cd $SNAPDIR1
log_must tar cf $SNAPSHOT_TARDIR/snapshot.tar .
cd $CWD || log_fail "Could not cd $CWD"
log_must cd $CWD
log_must mkdir $TESTDIR1/original
log_must mkdir $TESTDIR1/snapshot
log_must mkdir $TESTDIR1/original mkdir $TESTDIR1/snapshot
CWD=$PWD
cd $TESTDIR1/original || log_fail "Could not cd $TESTDIR1/original"
log_must cd $TESTDIR1/original
log_must tar xf $SNAPSHOT_TARDIR/original.tar
cd $TESTDIR1/snapshot || log_fail "Could not cd $TESTDIR1/snapshot"
log_must cd $TESTDIR1/snapshot
log_must tar xf $SNAPSHOT_TARDIR/snapshot.tar
cd $CWD || log_fail "Could not cd $CWD"
log_must cd $CWD
log_must directory_diff $TESTDIR1/original $TESTDIR1/snapshot
log_pass "Directory structures match."
tests/zfs-tests/tests/functional/snapshot/snapshot_007_pos.ksh
+10 -15
View File
@@ -49,24 +49,21 @@ function cleanup
{
typeset -i i=1
while [ $i -lt $COUNT ]; do
snapexists $SNAPCTR.$i
if [[ $? -eq 0 ]]; then
log_must zfs destroy $SNAPCTR.$i
fi
snapexists $SNAPCTR.$i && log_must zfs destroy $SNAPCTR.$i
if [[ -e $SNAPDIR.$i ]]; then
log_must rm -rf $SNAPDIR1.$i > /dev/null 2>&1
if [ -e $SNAPDIR.$i ]; then
log_must rm -rf $SNAPDIR1.$i
fi
(( i = i + 1 ))
done
if [[ -e $SNAPDIR1 ]]; then
log_must rm -rf $SNAPDIR1 > /dev/null 2>&1
if [ -e $SNAPDIR1 ]; then
log_must rm -rf $SNAPDIR1
fi
if [[ -e $TESTDIR ]]; then
log_must rm -rf $TESTDIR/* > /dev/null 2>&1
if [ -e $TESTDIR ]; then
log_must rm -rf $TESTDIR/*
fi
}
@@ -74,8 +71,7 @@ log_assert "Verify that many snapshots can be made on a zfs dataset."
log_onexit cleanup
[[ -n $TESTDIR ]] && \
log_must rm -rf $TESTDIR/* > /dev/null 2>&1
[ -n $TESTDIR ] && log_must rm -rf $TESTDIR/*
typeset -i COUNT=10
@@ -90,12 +86,11 @@ while [[ $i -lt $COUNT ]]; do
done
log_note "Remove all of the original files"
[[ -n $TESTDIR ]] && \
log_must rm -rf $TESTDIR1/file* > /dev/null 2>&1
[ -n $TESTDIR ] && log_must rm -f $TESTDIR1/file*
i=1
while [[ $i -lt $COUNT ]]; do
FILECOUNT=`ls $SNAPDIR1.$i/file* | wc -l`
FILECOUNT=`echo $SNAPDIR1.$i/file* | wc -w`
typeset j=1
while [ $j -lt $FILECOUNT ]; do
log_must file_check $SNAPDIR1.$i/file$j $j
tests/zfs-tests/tests/functional/snapshot/snapshot_008_pos.ksh
+3 -5
View File
@@ -55,16 +55,14 @@ function cleanup
(( i = i + 1 ))
done
[[ -e $TESTDIR ]] && \
log_must rm -rf $TESTDIR/* > /dev/null 2>&1
[ -e $TESTDIR ] && log_must rm -rf $TESTDIR/*
}
log_assert "Verify that destroying snapshots returns space to the pool."
log_onexit cleanup
[[ -n $TESTDIR ]] && \
log_must rm -rf $TESTDIR/* > /dev/null 2>&1
[ -n $TESTDIR ] && log_must rm -rf $TESTDIR/*
typeset -i COUNT=10
@@ -82,7 +80,7 @@ done
typeset -i i=1
while [[ $i -lt $COUNT ]]; do
log_must rm -rf $TESTDIR/file$i > /dev/null 2>&1
log_must rm -f $TESTDIR/file$i
log_must zfs destroy $SNAPFS.$i
(( i = i + 1 ))
tests/zfs-tests/tests/functional/snapshot/snapshot_011_pos.ksh
+2 -4
View File
@@ -53,15 +53,13 @@ function cleanup
{
snapexists $SNAPPOOL && destroy_dataset $SNAPPOOL -r
[[ -e $TESTDIR ]] && \
log_must rm -rf $TESTDIR/* > /dev/null 2>&1
[ -e $TESTDIR ] && log_must rm -rf $TESTDIR/*
}
log_assert "Verify that rollback to a snapshot created by snapshot -r succeeds."
log_onexit cleanup
[[ -n $TESTDIR ]] && \
log_must rm -rf $TESTDIR/* > /dev/null 2>&1
[ -n $TESTDIR ] && log_must rm -rf $TESTDIR/*
typeset -i COUNT=10
tests/zfs-tests/tests/functional/snapshot/snapshot_013_pos.ksh
+2 -4
View File
@@ -51,8 +51,7 @@ function cleanup
datasetexists $ctrfs && destroy_dataset $ctrfs -r
snapexists $snappool && destroy_dataset $snappool -r
[[ -e $TESTDIR ]] && \
log_must rm -rf $TESTDIR/* > /dev/null 2>&1
[ -e $TESTDIR ] && log_must rm -rf $TESTDIR/*
}
log_assert "Verify snapshots from 'snapshot -r' can be used for zfs send/recv"
@@ -67,8 +66,7 @@ snapctrfs=$ctrfs@$TESTSNAP
fsdir=/$ctrfs
snapdir=$fsdir/.zfs/snapshot/$TESTSNAP
[[ -n $TESTDIR ]] && \
log_must rm -rf $TESTDIR/* > /dev/null 2>&1
[ -n $TESTDIR ] && log_must rm -rf $TESTDIR/*
typeset -i COUNT=10
tests/zfs-tests/tests/functional/snapshot/snapshot_014_pos.ksh
+1 -2
View File
@@ -48,8 +48,7 @@ verify_runnable "both"
function cleanup
{
[[ -e $TESTDIR1 ]] && \
log_must rm -rf $TESTDIR1/* > /dev/null 2>&1
[ -e $TESTDIR1 ] && log_must rm -rf $TESTDIR1/*
snapexists $SNAPCTR && destroy_dataset $SNAPCTR