c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 18:59:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Enable zfs_rename_002_pos, zfs_rename_005_neg, zfs_rename_007_pos

Browse Source 
These tests all pass once updated to wait for udev to create the
expected linked under /dev/zvol/.

Reviewed-by: luozhengzheng <luo.zhengzheng@zte.com.cn>
Reviewed-by: yuxiang <guo.yong33@zte.com.cn>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #5275
This commit is contained in:
Brian Behlendorf 2016-10-13 16:00:26 -07:00
parent 9a875c6c5d
commit 7305538de3
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/runfiles/linux.run
View File

@ -147,13 +147,11 @@ tests = ['zfs_receive_001_pos', 'zfs_receive_002_pos', 'zfs_receive_003_pos',
'zfs_receive_013_pos'] 'zfs_receive_013_pos']
# DISABLED: # DISABLED:
# zfs_rename_002_pos - needs investigation
# zfs_rename_005_neg - nested pools
# zfs_rename_006_pos - needs investigation # zfs_rename_006_pos - needs investigation
# zfs_rename_007_pos - needs investigation
[tests/functional/cli_root/zfs_rename] [tests/functional/cli_root/zfs_rename]
tests = ['zfs_rename_001_pos', 'zfs_rename_003_pos', tests = ['zfs_rename_001_pos', 'zfs_rename_002_pos', 'zfs_rename_003_pos',
'zfs_rename_004_neg', 'zfs_rename_008_pos', 'zfs_rename_009_neg', 'zfs_rename_004_neg', 'zfs_rename_005_neg',
'zfs_rename_007_pos', 'zfs_rename_008_pos', 'zfs_rename_009_neg',
'zfs_rename_010_neg', 'zfs_rename_011_pos', 'zfs_rename_012_neg', 'zfs_rename_010_neg', 'zfs_rename_011_pos', 'zfs_rename_012_neg',
'zfs_rename_013_pos'] 'zfs_rename_013_pos']

1
tests/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename.kshlib
View File

@ -71,6 +71,7 @@ function rename_dataset # src dest
typeset dest=$2 typeset dest=$2
log_must $ZFS rename $src $dest log_must $ZFS rename $src $dest
block_device_wait
# #
# Verify src name no longer in use # Verify src name no longer in use

4
tests/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_007_pos.ksh
View File

@ -117,6 +117,7 @@ log_must $DIFF $SRC_FILE $obj
if is_global_zone; then if is_global_zone; then
vol=$TESTPOOL/$TESTFS/vol.$$ ; volclone=$TESTPOOL/$TESTFS/volclone.$$ vol=$TESTPOOL/$TESTFS/vol.$$ ; volclone=$TESTPOOL/$TESTFS/volclone.$$
log_must $ZFS create -V 100M $vol log_must $ZFS create -V 100M $vol
block_device_wait
obj=$(target_obj $vol) obj=$(target_obj $vol)
log_must $DD if=$SRC_FILE of=$obj bs=$BS count=$CNT log_must $DD if=$SRC_FILE of=$obj bs=$BS count=$CNT
@ -124,10 +125,12 @@ if is_global_zone; then
snap=${vol}@snap.$$ snap=${vol}@snap.$$
log_must $ZFS snapshot $snap log_must $ZFS snapshot $snap
log_must $ZFS clone $snap $volclone log_must $ZFS clone $snap $volclone
block_device_wait
# Rename dataset & clone # Rename dataset & clone
log_must $ZFS rename $vol ${vol}-new log_must $ZFS rename $vol ${vol}-new
log_must $ZFS rename $volclone ${volclone}-new log_must $ZFS rename $volclone ${volclone}-new
block_device_wait
# Compare source file and target file # Compare source file and target file
obj=$(target_obj ${vol}-new) obj=$(target_obj ${vol}-new)
@ -141,6 +144,7 @@ if is_global_zone; then
log_must $ZFS rename ${vol}-new $vol log_must $ZFS rename ${vol}-new $vol
log_must $ZFS rename $snap ${snap}-new log_must $ZFS rename $snap ${snap}-new
log_must $ZFS clone ${snap}-new $volclone log_must $ZFS clone ${snap}-new $volclone
block_device_wait
# Compare source file and target file # Compare source file and target file
obj=$(target_obj $volclone) obj=$(target_obj $volclone)