From owner-svn-src-all@freebsd.org Thu Mar 15 08:52:49 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D80F2F5A05D; Thu, 15 Mar 2018 08:52:49 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 830E974CD4; Thu, 15 Mar 2018 08:52:49 +0000 (UTC) (envelope-from avg@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 7D755140F2; Thu, 15 Mar 2018 08:52:49 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2F8qngF045126; Thu, 15 Mar 2018 08:52:49 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2F8qnRB045125; Thu, 15 Mar 2018 08:52:49 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201803150852.w2F8qnRB045125@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 15 Mar 2018 08:52:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r330975 - head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade X-SVN-Group: head X-SVN-Commit-Author: avg X-SVN-Commit-Paths: head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade X-SVN-Commit-Revision: 330975 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 08:52:50 -0000 Author: avg Date: Thu Mar 15 08:52:49 2018 New Revision: 330975 URL: https://svnweb.freebsd.org/changeset/base/330975 Log: re-enable zpool_upgrade_007_pos test after the fix in r330974 The test was disabled in r329248. PR: 225877 Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh ============================================================================== --- head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh Thu Mar 15 08:49:21 2018 (r330974) +++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh Thu Mar 15 08:52:49 2018 (r330975) @@ -207,7 +207,6 @@ zpool_upgrade_007_pos_body() . $(atf_get_srcdir)/zpool_upgrade.cfg verify_disk_count "$DISKS" 2 - atf_skip "PR 225877 - panic: solaris assert: newds == os->os_dsl_dataset during" ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_upgrade_007_pos.ksh || atf_fail "Testcase failed" }