diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run index f68a6f44d..a4a2686a1 100644 --- a/tests/runfiles/linux.run +++ b/tests/runfiles/linux.run @@ -87,12 +87,9 @@ tests = ['zfs_clone_001_neg', 'zfs_clone_002_pos', 'zfs_clone_003_pos', [tests/functional/cli_root/zfs_copies] 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 = ['zfs_create_001_pos', 'zfs_create_002_pos', - 'zfs_create_004_pos', 'zfs_create_005_pos', +tests = ['zfs_create_001_pos', 'zfs_create_002_pos', 'zfs_create_003_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_010_neg', 'zfs_create_011_pos', 'zfs_create_012_pos', 'zfs_create_013_pos'] diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_003_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_003_pos.ksh index bffe8cda4..dbb380e72 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_003_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_003_pos.ksh @@ -62,7 +62,7 @@ while (( i < ${#options[*]} )); do datasetexists $vol || \ 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)) done diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_006_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_006_pos.ksh index e47b06444..20a44cee7 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_006_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_006_pos.ksh @@ -67,7 +67,7 @@ while (( $i < ${#RW_VOL_PROP[*]} )); do log_fail "zfs create -V size $TESTPOOL/$TESTVOL1 fail." propertycheck $TESTPOOL/$TESTVOL1 ${RW_VOL_PROP[i]} || \ 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 \ $TESTPOOL/$TESTVOL1 @@ -75,7 +75,7 @@ while (( $i < ${#RW_VOL_PROP[*]} )); do log_fail "zfs create -s -V $TESTPOOL/$TESTVOL1 fail." propertycheck $TESTPOOL/$TESTVOL1 ${RW_VOL_PROP[i]} || \ 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 )) done