Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Fix zfs_clone_010_pos.ksh to verify zfs clones property displays right 

Because the macro ZFS_MAXPROPLEN used in function print_dataset
differs between platforms set it appropriately and calculate the expected
number of passes.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Laager <rlaager@wiktel.com>
Signed-off-by: yuxiang <guo.yong33@zte.com.cn>
Closes #5154
This commit is contained in:
liaoyuxiangqin 2016-09-30 04:08:44 +08:00 committed by Brian Behlendorf
parent db6597c6ea
commit 8a1cf1a560
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/runfiles/linux.run
View File

@ -74,11 +74,11 @@ tests = ['zfs_001_neg', 'zfs_002_pos', 'zfs_003_neg']
# DISABLED: # DISABLED:
# zfs_clone_005_pos - busy unmount # zfs_clone_005_pos - busy unmount
# zfs_clone_010_pos - needs investigation
[tests/functional/cli_root/zfs_clone] [tests/functional/cli_root/zfs_clone]
tests = ['zfs_clone_001_neg', 'zfs_clone_002_pos', 'zfs_clone_003_pos', tests = ['zfs_clone_001_neg', 'zfs_clone_002_pos', 'zfs_clone_003_pos',
'zfs_clone_004_pos', 'zfs_clone_006_pos', 'zfs_clone_004_pos', 'zfs_clone_006_pos',
'zfs_clone_007_pos', 'zfs_clone_008_neg', 'zfs_clone_009_neg'] 'zfs_clone_007_pos', 'zfs_clone_008_neg', 'zfs_clone_009_neg',
'zfs_clone_010_pos']
# DISABLED: # DISABLED:
# zfs_copies_003_pos - zpool on zvol # zfs_copies_003_pos - zpool on zvol

9
tests/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh
View File

@ -217,16 +217,21 @@ log_note "verify clone list truncated correctly"
typeset -i j=200 typeset -i j=200
i=1 i=1
fs=$TESTPOOL/$TESTFS1 fs=$TESTPOOL/$TESTFS1
if is_linux; then
ZFS_MAXPROPLEN=4096
else
ZFS_MAXPROPLEN=1024
fi
log_must $ZFS create $fs log_must $ZFS create $fs
log_must $ZFS snapshot $fs@snap log_must $ZFS snapshot $fs@snap
while((i < 7)); do while((i <= $(( $ZFS_MAXPROPLEN/200+1 )))); do
log_must $ZFS clone $fs@snap $fs/$TESTCLONE$(python -c 'print "x" * 200').$i log_must $ZFS clone $fs@snap $fs/$TESTCLONE$(python -c 'print "x" * 200').$i
((i=i+1)) ((i=i+1))
((j=j+200)) ((j=j+200))
done done
clone_list=$($ZFS list -o clones $fs@snap) clone_list=$($ZFS list -o clones $fs@snap)
char_count=$($ECHO "$clone_list" | $TAIL -1 | wc | $AWK '{print $3}') char_count=$($ECHO "$clone_list" | $TAIL -1 | wc | $AWK '{print $3}')
[[ $char_count -eq 1024 ]] || \ [[ $char_count -eq $ZFS_MAXPROPLEN ]] || \
log_fail "Clone list not truncated correctly. Unexpected character count" \ log_fail "Clone list not truncated correctly. Unexpected character count" \
"$char_count" "$char_count"