From owner-svn-src-head@freebsd.org  Tue Oct  8 15:33:12 2019
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0932D12DB14;
 Tue,  8 Oct 2019 15:33:12 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 46nhFM6SYXz47Ph;
 Tue,  8 Oct 2019 15:33:11 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C125D20EF;
 Tue,  8 Oct 2019 15:33:11 +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 x98FXBJE072212;
 Tue, 8 Oct 2019 15:33:11 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x98FXBaM072211;
 Tue, 8 Oct 2019 15:33:11 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201910081533.x98FXBaM072211@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 8 Oct 2019 15:33:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r353309 - head/tests/sys/cddl/zfs/tests/zfsd
X-SVN-Group: head
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: head/tests/sys/cddl/zfs/tests/zfsd
X-SVN-Commit-Revision: 353309
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Oct 2019 15:33:12 -0000

Author: asomers
Date: Tue Oct  8 15:33:11 2019
New Revision: 353309
URL: https://svnweb.freebsd.org/changeset/base/353309

Log:
  zfs: fix the zfsd_autoreplace_003_pos test
  
  The test declared that it only needed 5 disks, but actually tried to use 6.
  Fix it to use just 5, which is all it really needs.
  
  MFC after:	2 weeks
  Sponsored by:	Axcient

Modified:
  head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh

Modified: head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh
==============================================================================
--- head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh	Tue Oct  8 15:03:48 2019	(r353308)
+++ head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh	Tue Oct  8 15:33:11 2019	(r353309)
@@ -78,11 +78,11 @@ function verify_assertion
 typeset PHYSPATH="some_physical_path"
 typeset REMOVAL_DISK=$DISK0
 typeset REMOVAL_NOP=${DISK0}.nop
-typeset NEW_DISK=$DISK4
-typeset NEW_NOP=${DISK4}.nop
-typeset SPARE_DISK=${DISK5}
-typeset SPARE_NOP=${DISK5}.nop
-typeset OTHER_DISKS="${DISK1} ${DISK2} ${DISK3}"
+typeset NEW_DISK=$DISK3
+typeset NEW_NOP=${DISK3}.nop
+typeset SPARE_DISK=${DISK4}
+typeset SPARE_NOP=${DISK4}.nop
+typeset OTHER_DISKS="${DISK1} ${DISK2}"
 typeset OTHER_NOPS=${OTHER_DISKS//~(E)([[:space:]]+|$)/.nop\1}
 set -A MY_KEYWORDS "mirror" "raidz1" "raidz2"
 ensure_zfsd_running