summaryrefslogtreecommitdiffstats
path: root/tests/zfs-tests
diff options
context:
space:
mode:
authorRyan Moeller <[email protected]>2019-09-05 19:20:09 -0400
committerBrian Behlendorf <[email protected]>2019-09-05 16:20:09 -0700
commit8e2c502cf3f54201a75e5b8ea983358f2b9939f9 (patch)
treea5f47fd8c7f8d7104a035e58f23fe16e7e2d83d2 /tests/zfs-tests
parent03fdcb9adc596fb86a65edb56d8088b77ea2d891 (diff)
Clean up zfs_clone_010_pos
Remove a lot of unnecessary setting and incrementing of `i`. Remove unused variable `j`. Instead of calling out to Python in a loop to generate the same string repeatedly, generate the string once using shell constructs before entering the loop. Reviewed-by: Igor Kozhukhov <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Richard Elling <[email protected]> Signed-off-by: Ryan Moeller <[email protected]> Closes #9284
Diffstat (limited to 'tests/zfs-tests')
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh15
1 files changed, 3 insertions, 12 deletions
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh
index 62a755eae..dcf80095d 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh
@@ -143,7 +143,6 @@ datasets="$TESTPOOL/$TESTFS1 $TESTPOOL/$TESTFS1/$TESTFS2
typeset -a d_clones
typeset -a deferred_snaps
typeset -i i
-i=1
log_must setup_ds
log_note "Verify zfs clone property for multiple clones"
@@ -157,19 +156,16 @@ for ds in $datasets; do
((i=i+1))
done
names=$(zfs list -rt all -o name $TESTPOOL)
-i=1
log_must verify_clones 2 1
log_must local_cleanup
log_must setup_ds
log_note "verify zfs deferred destroy on clones property"
-i=1
names=$(zfs list -rt all -o name $TESTPOOL)
for ds in $datasets; do
log_must zfs destroy -d $ds@snap
deferred_snaps=( "${deferred_snaps[@]}" "$ds@snap" )
- ((i=i+1))
done
log_must verify_clones 3 0
@@ -206,17 +202,14 @@ for ds in $datasets; do
done
names=$(zfs list -rt all -o name,clones $TESTPOOL)
log_must verify_clones 3 1 $TESTCLONE
-i=1
for ds in $datasets; do
log_must zfs promote $ds
- ((i=i+1))
done
log_must local_cleanup
log_note "verify clone list truncated correctly"
-typeset -i j=200
-i=1
fs=$TESTPOOL/$TESTFS1
+xs=""; for i in {1..200}; do xs+="x"; done
if is_linux; then
ZFS_MAXPROPLEN=4096
else
@@ -224,10 +217,8 @@ else
fi
log_must zfs create $fs
log_must zfs snapshot $fs@snap
-while((i <= $(( ZFS_MAXPROPLEN/200+1 )))); do
- log_must zfs clone $fs@snap $fs/$TESTCLONE$(python -c 'print "x" * 200').$i
- ((i=i+1))
- ((j=j+200))
+for (( i = 1; i <= (ZFS_MAXPROPLEN / 200 + 1); i++ )); do
+ log_must zfs clone ${fs}@snap ${fs}/${TESTCLONE}${xs}.${i}
done
clone_list=$(zfs list -o clones $fs@snap)
char_count=$(echo "$clone_list" | tail -1 | wc | awk '{print $3}')