From owner-svn-src-projects@freebsd.org Wed Dec 16 20:52:01 2015 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 72D61A49B0B for ; Wed, 16 Dec 2015 20:52:01 +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 424921C9B; Wed, 16 Dec 2015 20:52:01 +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 tBGKq0jO072245; Wed, 16 Dec 2015 20:52:00 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBGKq0Lt072244; Wed, 16 Dec 2015 20:52:00 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201512162052.tBGKq0Lt072244@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 16 Dec 2015 20:52:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r292365 - projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy X-SVN-Group: projects 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.20 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: Wed, 16 Dec 2015 20:52:01 -0000 Author: asomers Date: Wed Dec 16 20:52:00 2015 New Revision: 292365 URL: https://svnweb.freebsd.org/changeset/base/292365 Log: redundancy tests shouldn't expect a specific number of errors tests/sys/cddl/zfs/tests/redundancy/redundancy.kshlib damage_devs: Accept >= 1 checksum errors in any case. In the case of raidz, the original device may not be attributed the checksum error. Submitted by: Will Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/redundancy.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/redundancy.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/redundancy.kshlib Wed Dec 16 20:49:25 2015 (r292364) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/redundancy.kshlib Wed Dec 16 20:52:00 2015 (r292365) @@ -218,9 +218,7 @@ function damage_devs sync_pool $pool wait_for 20 1 is_pool_scrubbed $pool - cnt_arg=$cnt - [ "$label" = "keep_label" ] && cnt_arg="" - log_must pool_has_errors $pool $cnt_arg + log_must pool_has_errors $pool else # The pool can be syncing, thus fixing its labels. So we # have to keep trying until all the devices go offline.