From owner-svn-src-projects@freebsd.org Tue Nov 14 22:22:51 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CD225DDF856 for ; Tue, 14 Nov 2017 22:22:51 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 96CF772155; Tue, 14 Nov 2017 22:22:51 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAEMMoDN086549; Tue, 14 Nov 2017 22:22:50 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAEMMoGH086546; Tue, 14 Nov 2017 22:22:50 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201711142222.vAEMMoGH086546@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 14 Nov 2017 22:22:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r325832 - projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline X-SVN-Commit-Revision: 325832 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Nov 2017 22:22:51 -0000 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"