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

Update zfs_create_003_pos.ksh and zfs_create_006_pos.ksh 

As the scripts zfs_create_003_pos.ksh and zfs_create_006_pos.ksh can
run successfully in the linux, add them to the <linux.run> file to
increase test scene.

Signed-off-by: ChaoyuZhang <zhang.chaoyu@zte.com.cn>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #5002
This commit is contained in:
ChaoyuZhang 2016-08-22 10:27:06 +08:00 committed by Brian Behlendorf
parent e623aea2ec
commit 43cb1c1212
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/runfiles/linux.run
View File

@ -87,12 +87,9 @@ tests = ['zfs_clone_001_neg', 'zfs_clone_002_pos', 'zfs_clone_003_pos',
[tests/functional/cli_root/zfs_copies] [tests/functional/cli_root/zfs_copies]
tests = ['zfs_copies_001_pos', 'zfs_copies_004_neg', 'zfs_copies_006_pos'] tests = ['zfs_copies_001_pos', 'zfs_copies_004_neg', 'zfs_copies_006_pos']
# DISABLED:
# zfs_create_006_pos - needs investigation
# zfs_create_003_pos - needs investigation
[tests/functional/cli_root/zfs_create] [tests/functional/cli_root/zfs_create]
tests = ['zfs_create_001_pos', 'zfs_create_002_pos', tests = ['zfs_create_001_pos', 'zfs_create_002_pos', 'zfs_create_003_pos',
'zfs_create_004_pos', 'zfs_create_005_pos', 'zfs_create_004_pos', 'zfs_create_005_pos', 'zfs_create_006_pos',
'zfs_create_007_pos', 'zfs_create_008_neg', 'zfs_create_009_neg', 'zfs_create_007_pos', 'zfs_create_008_neg', 'zfs_create_009_neg',
'zfs_create_010_neg', 'zfs_create_011_pos', 'zfs_create_012_pos', 'zfs_create_010_neg', 'zfs_create_011_pos', 'zfs_create_012_pos',
'zfs_create_013_pos'] 'zfs_create_013_pos']

2
tests/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_003_pos.ksh
View File

@ -62,7 +62,7 @@ while (( i < ${#options[*]} )); do
datasetexists $vol || \ datasetexists $vol || \
log_fail "zfs create ${options[i]} -V $VOLSIZE $vol fail." log_fail "zfs create ${options[i]} -V $VOLSIZE $vol fail."
log_must $ZFS destroy -f $vol log_must_busy $ZFS destroy -f $vol
((i = i + 1)) ((i = i + 1))
done done

4
tests/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_006_pos.ksh
View File

@ -67,7 +67,7 @@ while (( $i < ${#RW_VOL_PROP[*]} )); do
log_fail "zfs create -V size $TESTPOOL/$TESTVOL1 fail." log_fail "zfs create -V size $TESTPOOL/$TESTVOL1 fail."
propertycheck $TESTPOOL/$TESTVOL1 ${RW_VOL_PROP[i]} || \ propertycheck $TESTPOOL/$TESTVOL1 ${RW_VOL_PROP[i]} || \
log_fail "${RW_VOL_PROP[i]} is failed to set." log_fail "${RW_VOL_PROP[i]} is failed to set."
log_must $ZFS destroy -f $TESTPOOL/$TESTVOL1 log_must_busy $ZFS destroy -f $TESTPOOL/$TESTVOL1
log_must $ZFS create -s -o ${RW_VOL_PROP[$i]} -V $VOLSIZE \ log_must $ZFS create -s -o ${RW_VOL_PROP[$i]} -V $VOLSIZE \
$TESTPOOL/$TESTVOL1 $TESTPOOL/$TESTVOL1
@ -75,7 +75,7 @@ while (( $i < ${#RW_VOL_PROP[*]} )); do
log_fail "zfs create -s -V $TESTPOOL/$TESTVOL1 fail." log_fail "zfs create -s -V $TESTPOOL/$TESTVOL1 fail."
propertycheck $TESTPOOL/$TESTVOL1 ${RW_VOL_PROP[i]} || \ propertycheck $TESTPOOL/$TESTVOL1 ${RW_VOL_PROP[i]} || \
log_fail "${RW_VOL_PROP[i]} is failed to set." log_fail "${RW_VOL_PROP[i]} is failed to set."
log_must $ZFS destroy -f $TESTPOOL/$TESTVOL1 log_must_busy $ZFS destroy -f $TESTPOOL/$TESTVOL1
(( i = i + 1 )) (( i = i + 1 ))
done done