Enable all zfs_destroy test cases

* zfs_destroy_001_pos - Unable to reproduce the failures locally. Re-enabled to determine observed buildbot failure rate. * zfs_destroy_005_neg - Updated for expected Linux behavior. Busy mount points, even snapshots, are expected to fail. * zfs_destroy_010_pos - Resolved transient EBUSY with retry. Signed-off-by: Brian Behlendorf <[email protected]> Issue openzfs#5635 Issue openzfs#5893
behlendorf · May 2, 2017 · 0b3a7be · 0b3a7be
1 parent 9d3f7b8
commit 0b3a7be
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run
@@ -99,15 +99,13 @@ tests = ['zfs_create_001_pos', 'zfs_create_002_pos', 'zfs_create_003_pos',
     'zfs_create_010_neg', 'zfs_create_011_pos', 'zfs_create_012_pos',
     'zfs_create_013_pos', 'zfs_create_014_pos']
 
-# DISABLED:
-# zfs_destroy_005_neg - busy mountpoint behavior
-# zfs_destroy_001_pos - https://github.com/zfsonlinux/zfs/issues/5635
 [tests/functional/cli_root/zfs_destroy]
-tests = ['zfs_destroy_002_pos', 'zfs_destroy_003_pos',
-    'zfs_destroy_004_pos','zfs_destroy_006_neg', 'zfs_destroy_007_neg',
-    'zfs_destroy_008_pos','zfs_destroy_009_pos', 'zfs_destroy_010_pos',
-    'zfs_destroy_011_pos','zfs_destroy_012_pos', 'zfs_destroy_013_neg',
-    'zfs_destroy_014_pos','zfs_destroy_015_pos', 'zfs_destroy_016_pos']
+tests = ['zfs_destroy_001_pos', 'zfs_destroy_002_pos', 'zfs_destroy_003_pos',
+    'zfs_destroy_004_pos', 'zfs_destroy_005_neg', 'zfs_destroy_006_neg',
+    'zfs_destroy_007_neg', 'zfs_destroy_008_pos', 'zfs_destroy_009_pos',
+    'zfs_destroy_010_pos', 'zfs_destroy_011_pos', 'zfs_destroy_012_pos',
+    'zfs_destroy_013_neg', 'zfs_destroy_014_pos', 'zfs_destroy_015_pos',
+    'zfs_destroy_016_pos']
 
 # DISABLED:
 # zfs_get_004_pos - https://github.com/zfsonlinux/zfs/issues/3484

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_005_neg.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_005_neg.ksh
@@ -187,9 +187,12 @@ pidlist=""
 
 #
 # Create the clones for test environment and make the snapshot busy.
-# Then verify 'zfs destroy $snap' succeeds without '-f'.
 #
-# Then verify the snapshot and clone are destroyed, but nothing else is.
+# For Linux verify 'zfs destroy $snap' fails due to the busy mount point.  Then
+# verify the snapshot remains and the clone was destroyed, but nothing else is.
+#
+# Under illumos verify 'zfs destroy $snap' succeeds without '-f'.  Then verify
+# the snapshot and clone are destroyed, but nothing else is.
 #
 
 mntpt=$(snapshot_mountpoint $FSSNAP)
@@ -199,9 +202,16 @@ log_note "mkbusy $mntpt (pidlist: $pidlist)"
 
 for option in -R -rR ; do
 	setup_testenv clone
-	log_must zfs destroy $option $FSSNAP
-	check_dataset datasetexists $CTR $FS $VOL
-	check_dataset datasetnonexists $FSSNAP $FSCLONE
+
+	if is_linux; then
+		log_mustnot zfs destroy $option $FSSNAP
+		check_dataset datasetexists $CTR $FS $VOL $FSSNAP
+		check_dataset datasetnonexists $FSCLONE
+	else
+		log_must zfs destroy $option $FSSNAP
+		check_dataset datasetexists $CTR $FS $VOL
+		check_dataset datasetnonexists $FSSNAP $FSCLONE
+	fi
 done
 
 log_must kill $pidlist

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_010_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_010_pos.ksh
@@ -54,7 +54,7 @@ function test_clone_run
     clone=$(eval echo \$${dstype}CLONE)
     log_must zfs destroy -d $snap
     log_must datasetexists $snap
-    log_must zfs destroy -R $clone
+    log_must_busy zfs destroy -R $clone
     log_mustnot datasetexists $snap
     log_mustnot datasetexists $clone
 }