svn commit: r325832 - projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline

[Alan Somers]

Author: asomers
Date: Tue Nov 14 22:22:50 2017
New Revision: 325832
URL: https://svnweb.freebsd.org/changeset/base/325832

Log:
  Actually run reap_children during online_offline's cleanup
  
  tests/sys/cddl/zfs/tests/online_offline/cleanup.ksh
  tests/sys/cddl/zfs/tests/online_offline/online_offline_001_pos.ksh
  tests/sys/cddl/zfs/tests/online_offline/online_offline_002_neg.ksh
  	It seems that reap_children was intended to run during cleanup, but
  	the onexit hook was never set.  So I just moved it to the
  	cleanup.ksh script, because all test cases in this directory need
  	it.
  
  Sponsored by:	Spectra Logic Corp

Modified:
  projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/cleanup.ksh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/online_offline_001_pos.ksh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/online_offline_002_neg.ksh

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/cleanup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/cleanup.ksh	Tue Nov 14 22:18:13 2017	(r325831)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/cleanup.ksh	Tue Nov 14 22:22:50 2017	(r325832)
@@ -31,6 +31,7 @@
 
 verify_runnable "global"
 
+reap_children
 default_cleanup_noexit
 cleanup_devices ${DISKS}
 log_pass

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/online_offline_001_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/online_offline_001_pos.ksh	Tue Nov 14 22:18:13 2017	(r325831)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/online_offline_001_pos.ksh	Tue Nov 14 22:22:50 2017	(r325832)
@@ -30,11 +30,6 @@
 
 verify_runnable "global"
 
-function cleanup
-{
-	reap_children
-}
-
 function verify_assertion
 {
 	busy_path $TESTDIR

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/online_offline_002_neg.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/online_offline_002_neg.ksh	Tue Nov 14 22:18:13 2017	(r325831)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/online_offline_002_neg.ksh	Tue Nov 14 22:22:50 2017	(r325832)
@@ -30,11 +30,6 @@
 
 verify_runnable "global"
 
-function cleanup
-{
-	reap_children
-}
-
 function verify_assertion
 {
 	keyword="$1"