aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAndriy Gapon <avg@FreeBSD.org>2018-03-15 08:52:49 +0000
committerAndriy Gapon <avg@FreeBSD.org>2018-03-15 08:52:49 +0000
commit3c9d418b7e6ebca7a152ce78e360baec6101e907 (patch)
tree87c4123155a1ae1549e03ed5e1e9475723ecb0f6 /tests
parent289c14e8112e2ecf4dcc67580d291ea57e7f7f32 (diff)
downloadsrc-3c9d418b7e6ebca7a152ce78e360baec6101e907.tar.gz
src-3c9d418b7e6ebca7a152ce78e360baec6101e907.zip
re-enable zpool_upgrade_007_pos test after the fix in r330974
The test was disabled in r329248. PR: 225877
Notes
Notes: svn path=/head/; revision=330975
Diffstat (limited to 'tests')
-rwxr-xr-xtests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh b/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh
index 3eed23ffc996..8cdd8d704e2d 100755
--- a/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh
+++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh
@@ -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"
}