svn commit: r330975 - head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade

[Andriy Gapon]

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"
 }