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 4P4Nlw3VSyz3bVmd; 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 4P4Nlw2j92z4PPh; 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=rxMqdQmr0H11PTc7PSE6+N9x4/3UhL99yC76pQnrrlk=; b=PZVyYF4geXaQJRRkxd0mWLgZ/BGYAHGTgCZowWMsngKhj03FbaC8cTtA0xp+nDwkqZunN3 4sePgLIdqIK3AyxXx7/6a3twem5Kceho7eLr3zB1a1kiMo0FKYww67Gh9doFPls+RoAGZb YnqcX4T3UX559CyIISHHc1P87RZ61DUjxIJumlrM/e1u6r6ywo4G3uQRwW45OzFl88bDTz er8/AAnAm8JBxQjl+Z11vwc0sZxT3Jw5vTei3nei0eYdy+IW2+z+Brh0HM/wGmSrT5Y23z pneKTxUCNNom/UnCzZAZVwgrjRVwr5hzwPIplw9PIkxK920YXrOBrS1yW+i6Bw== 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=rxMqdQmr0H11PTc7PSE6+N9x4/3UhL99yC76pQnrrlk=; b=wnhRY3KwQmpJYJHsHA0MGpOVFz/TwWYDd6QMnT+d2bP+BO6iYTt6yCYaRhsBoMFwJTmaan qvheO2kdEk15Vfzkm0RYeF4O9XjGns2o+DOJgGStFLeDuvaTAsQLSBHZzZFzi9lPf1OYep X0KooZeOnkbpAyhq09FHKYwZDsUV3vAc/XgNkLrgiOWOdWUE5DsnIPKhI0+lm9J18Vt5qi Ij3SR35Zt0Z83X+QtfXJR7qYTrJ4Xb2reaudEWiiFfF/dnHTm+2JHnvJJwhlJ9E+VqXA+R +mRcbgx/bSGQ/6m+1sm6CnrhUiWO5pL0CD4LiqwJe4epbbvmTNqdLmSKft5qYg== 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=UIrJGn7KcDvy3I/eTt/FjsOKoCctawZTi6OgMNU4zJRPJaB7AuSdShd0LeL0I65wuaX7Ii M74yWVpOLKhq9JAzdUofP2gYkeG1U/g0wxxVqm9vc863FkBt6xMF2cD8hhg393mPvw45OV 7V42ViZtHR6XV8rRhTU/Kyp2u6dWKfBiCJPr3NQjBzN1bMuiFdnJWpZ/tRV32uSI4qt24E gEZ2QFIYDjRLNsti8+U+OOzAMeJAtwtd05KQnEDEc1pbqVnWhugb/xFjqAC9sL8gS9wRdL WEAwltbxgyHlrna7ds4zLDi77e1ZNbAoxnPFeDPimNDsZBdvxKis76W1VegdeQ== 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 4P4Nlw1P7MzLL1; 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 30T7oq0D047776; 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 30T7oqb6047775; Sun, 29 Jan 2023 07:50:52 GMT (envelope-from git) Date: Sun, 29 Jan 2023 07:50:52 GMT Message-Id: <202301290750.30T7oqb6047775@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: 668a32ab231d - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: 668a32ab231df18dba8b70f7a13f736dbb486210 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=668a32ab231df18dba8b70f7a13f736dbb486210 commit 668a32ab231df18dba8b70f7a13f736dbb486210 Author: Kajetan Staszkiewicz AuthorDate: 2023-01-20 09:43:02 +0000 Commit: Kristof Provost CommitDate: 2023-01-29 02:34:56 +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 100755 --- 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()