Date: Fri, 14 Jul 2023 21:59:00 GMT From: Alan Somers <asomers@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 2a0c0aea4209 - main - Fix zfsd unittests after 92642bba4db Message-ID: <202307142159.36ELx0h8041599@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=2a0c0aea42092f89c2a5345991e6e3ce4cbef99a commit 2a0c0aea42092f89c2a5345991e6e3ce4cbef99a Author: Alan Somers <asomers@FreeBSD.org> AuthorDate: 2023-07-14 21:57:40 +0000 Commit: Alan Somers <asomers@FreeBSD.org> CommitDate: 2023-07-14 21:57:40 +0000 Fix zfsd unittests after 92642bba4db At the time we ensured that the more important functional tests were working, but neglected to update the unit tests. MFC after: 2 weeks MFC with: 92642bba4db4bf1719758ac7233468bc09a0bd59 Sponsored by: Axcient --- cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc b/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc index e2833170f9ac..882524c83efd 100644 --- a/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc +++ b/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc @@ -400,7 +400,7 @@ TEST_F(ZfsEventTest, ProcessPoolEventGetsCalled) { string evString("!system=ZFS " "subsystem=ZFS " - "type=misc.fs.zfs.vdev_remove " + "type=sysevent.fs.zfs.vdev_remove " "pool_name=foo " "pool_guid=9756779504028057996 " "vdev_guid=1631193447431603339 " @@ -515,7 +515,7 @@ TEST_F(CaseFileTest, PoolDestroy) "pool_guid=456 " "subsystem=ZFS " "timestamp=1348867914 " - "type=misc.fs.zfs.pool_destroy "); + "type=sysevent.fs.zfs.pool_destroy "); m_event = Event::CreateEvent(*m_eventFactory, evString); ZfsEvent *zfs_event = static_cast<ZfsEvent*>(m_event); EXPECT_CALL(*m_caseFile, Close()); @@ -685,7 +685,7 @@ string ReEvaluateByGuidTest::s_evString( "pool_name=foo " "subsystem=ZFS " "timestamp=1360620391 " - "type=misc.fs.zfs.config_sync"); + "type=sysevent.fs.zfs.config_sync"); /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307142159.36ELx0h8041599>