From nobody Fri Jul 14 21:59:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R2ljw6G1Qz4nDXl; Fri, 14 Jul 2023 21:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2ljw5qHvz3q5r; Fri, 14 Jul 2023 21:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689371940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ziL7LinHRR5D9HCvn8mXg1PmraA1Y31IsGkS/4Ebxbs=; b=vKgylvkfROCBmw1kK3jL2/vgYt4zvX0GRoZrBfnKSbxFDOhz0026VlBB+viHJHbBJkLdCY nTm8oZtt0oIEiZAtRqK39J+Q7SG+5ZbSLtd83QJE9lz0TjmoMCatTBbk+qtizU3DYo4ZtH uf+Dx7zEgTM3VmhVaFUgogIFZjfrLw/kTgc3jXBqdP6AyLUD9n1nJA8T3A1/gd2mXgxaqA FDpPX38jOqetJ1RvTak6i10G52vJd9W5hf4YgPwz0H20/HHUzP5teDvFwOpkeXzSco5ifG R1zgM18XKPQkz+djJGj2XWXcfmN8bsFToG0k+C+VrNpr0X/OReXsyTHLrcud/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689371940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ziL7LinHRR5D9HCvn8mXg1PmraA1Y31IsGkS/4Ebxbs=; b=w1ZrwZ7pWI7EsC9u5ZN3cMHtqQ0RwJjawRGhsNGdVwMPTNX5K2eRNWle5B417dqRIYScsB L5T2VlBjrJ8umSsYnFPATYttvwwpovV/AQ3i26hlQmzG0SIycKPu8iIMYlBOME+6mmpgWA a6HFtB7TrcpyblYElY1Mi+IZiBUyP/x+C6E8EF710CrHwH+NmKucYgIFywbRpla7zklJel muuscV8pSgIj50lZmQICPil5N5CARO/WTuR3CvugOImu2FiEJjzhga7NBMW1hqc7ckS9fo Fgv+Ce7l4p8UufhD3LbGVVgAJPIiuiqFVGseLP15pmdfBrZEVpSKW2Rpvg4nZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689371940; a=rsa-sha256; cv=none; b=jftH/D839YVrraY3OQ1urKrhHQdDfXRQon4ebb9snNV4ykikbR/1G/wtGhdBJtBHJ+DDfa EFTHyV6K1kjlg/q9MIgt4moVKbTRJ+gEgEgReU7GdTQfF2j7R/YtBHXyq+M67Wx6uffldK MiXkwpeMaSocHo9LyjtWAp5oCVCQeLGjLdwblgyHqnrZryqnOWaxqm1WR6yYvdUiUAqEdk iCx7Wls8e8aXuczDMfrO/0yn+OITXl5DkXtMQ3ymHUPewyDZkXADgd49tazcMXZro/xoDu c+Db0yR/T+QVuk4m6+bOsj9JaqV5UiN98agBrmNKkCkBxXDcC4rygvKxJTBoJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2ljw4vmvzZMN; Fri, 14 Jul 2023 21:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36ELx04v041600; Fri, 14 Jul 2023 21:59:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36ELx0h8041599; Fri, 14 Jul 2023 21:59:00 GMT (envelope-from git) Date: Fri, 14 Jul 2023 21:59:00 GMT Message-Id: <202307142159.36ELx0h8041599@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 2a0c0aea4209 - main - Fix zfsd unittests after 92642bba4db List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a0c0aea42092f89c2a5345991e6e3ce4cbef99a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=2a0c0aea42092f89c2a5345991e6e3ce4cbef99a commit 2a0c0aea42092f89c2a5345991e6e3ce4cbef99a Author: Alan Somers AuthorDate: 2023-07-14 21:57:40 +0000 Commit: Alan Somers 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(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"); /*