From nobody Sun Jan 29 07:50:52 2023 X-Original-To: dev-commits-src-branches@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 4P4Nlw6xDMz3bVpy; Sun, 29 Jan 2023 07:50:52 +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 4P4Nlw60cFz4PK2; Sun, 29 Jan 2023 07:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674978652; 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=nbUEhtAfbqWIM9X1hZqVNjQ2FnDG1+ULoWWVkUlxn+Y=; b=ji/CEDdFNFGjXndyKA2nLsV86MPKGNR99bkEAqALBjSvC1tRzyzvkzf1xqoAmlvkzI3/Ck o+EoKuRhRiyPsCpZN0JYOfPE/jzLt5B/YZ86c715CnYVuEkUb7IWb9O3An1yoeA+0yfAwI ++pyhah1cDVJU8mTPku6Qsh/uED/MSMBM6fPh+B8vnmKsoABs/OJ2Md4tmYdFkWU0thDzt ELJr+C5OvuUtY09aZT1UXsYqjhGyEnZgbYqGm8TNb6DHyT3xIiOR9Qp8mRqrIzclQLATEl 6Rb304Q7twaj8ByksK0DZAbE+jMkyU6xk+zRRcYuDWTenMc4Wa9lg7huz9oDWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674978652; 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=nbUEhtAfbqWIM9X1hZqVNjQ2FnDG1+ULoWWVkUlxn+Y=; b=T29Ar+58emX5bTH7zJc+//jJKTZSn8vANAlgYKFo5qhjmsqkKhKRPVtXtKto3pHZN2gscn azkLANZOVpeD4P0axJ8x2o9oouPzXpTCsI8aVFEkS4lIxO1houEvvZq+4+riYaaC3rb305 Frf4A7FRSl0/yCctoUUQSER6khYBe83JUJpkyB3Pr9aNzcj90Aw6cVDVOOfbBjvxcOtiuG v28lOaibnmN5MOt5A1havZC0gWE8KhV6xOB/+5GqgOxraZeRwHWot8RSjj30kTF4awgxmM aSy1us16kzS1Ist/zD0zm7YYdHDSSiioUh9T8RIYqW9heFaEPI4jNTjpPCdeWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674978652; a=rsa-sha256; cv=none; b=LA9Osp1YjSAw++cU/gBH5b48ddgH7lXVo/U/Y7fLXc9q2Z3lfBVXSp856AtgDOtmCw/9Gx mxoyJ7IRs9wFMxQ3z2jT3fA9LKLf76qH/7KZe2NIL9WTBIj/EhRWskP4NqEhYKO7ZtfwVh po9xLTQ4t4+3VfomrI3St2kP+o3vkaNlMTQUmRpgpZDfmVgC7ckXBV8MhaDQ6R6+RkfKvc dJOM+5aub27QOo0XECVtOd483j6vy0+1sdiSyQjJxJYnQIy/UIvWJ+OUv2L9/juwR7zDFH AeAsnEnHSt3g/JaGiE41Z0TQQh/2DihDLiaBj1+ETY2qJoDRfoR30G66MRXSDA== 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 4P4Nlw4pYLzLL2; Sun, 29 Jan 2023 07:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30T7oq4g047800; Sun, 29 Jan 2023 07:50:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30T7oqUO047799; Sun, 29 Jan 2023 07:50:52 GMT (envelope-from git) Date: Sun, 29 Jan 2023 07:50:52 GMT Message-Id: <202301290750.30T7oqUO047799@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 3c37c1ea1989 - stable/13 - netpfil tests: improve pfsync_defer.py List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3c37c1ea19892d672325657905ffb4c27dd81472 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3c37c1ea19892d672325657905ffb4c27dd81472 commit 3c37c1ea19892d672325657905ffb4c27dd81472 Author: Kajetan Staszkiewicz AuthorDate: 2023-01-20 09:43:02 +0000 Commit: Kristof Provost CommitDate: 2023-01-29 05:37:46 +0000 netpfil tests: improve pfsync_defer.py Return different exit code depending on which failure was encountered. The pfsync test expect a very particular failure, not just any. MFC after: 1 week Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D38123 (cherry picked from commit 06012728beff45e94d58410eae7cda2ea980ef77) --- tests/sys/netpfil/pf/pfsync.sh | 2 +- tests/sys/netpfil/pf/pfsync_defer.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/sys/netpfil/pf/pfsync.sh b/tests/sys/netpfil/pf/pfsync.sh index bbe3fbcb1d2a..737753103683 100644 --- a/tests/sys/netpfil/pf/pfsync.sh +++ b/tests/sys/netpfil/pf/pfsync.sh @@ -168,7 +168,7 @@ defer_body() "set skip on ${epair_sync}a" \ "pass keep state" - atf_check -s exit:1 env PYTHONPATH=${common_dir} \ + atf_check -s exit:3 env PYTHONPATH=${common_dir} \ $(atf_get_srcdir)/pfsync_defer.py \ --syncdev ${epair_sync}b \ --indev ${epair_in}b \ diff --git a/tests/sys/netpfil/pf/pfsync_defer.py b/tests/sys/netpfil/pf/pfsync_defer.py index 4a691240b466..c1d90d4483c4 100644 --- a/tests/sys/netpfil/pf/pfsync_defer.py +++ b/tests/sys/netpfil/pf/pfsync_defer.py @@ -117,15 +117,15 @@ def main(): sys.exit(1) if not got_ping: - sys.exit(1) + sys.exit(2) if got_pfsync > got_ping: - sys.exit(1) + sys.exit(3) # Deferred packets are delayed up to 20ms (unless the pfsync peer, which we # don't have here, acks their state update earlier) if (sent_ping + 0.020) > got_ping: - sys.exit(1) + sys.exit(4) if __name__ == '__main__': main()