From nobody Sun Jan 22 04:53:43 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 4P018l6Zlyz2t5G6; Sun, 22 Jan 2023 04:53:43 +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 4P018l5jRLz46nm; Sun, 22 Jan 2023 04:53:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674363223; 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=/amXRNmT/d7ADic/jzFW66c+ytyXxhSusnj9kOLYcMA=; b=HES9fDBk3UvqaRE1v9fEBfY58dsUEfPmsdbjKL+5csaPPKvLFBpkLOTnQeFZFGzWG0H27f EjM8WFWI7n21zOSOzoSogWrFDYuVUQ+dqMaRZd7l+qwVf743GjcWDnrC4XunAgf3+wlEry Ez49mDsrVhray8+XeQvBauSwI6PyWpYQ20Jzz6afJE1P6i0FYH67NUR8BLKE9HcGx1/1oy JVlEvMlDRljJzI7knLNLKQg7D2Zv/uqwG/pQ+1ZApFz5STJuDuJvHreN80yKTyz9ZRgwXN z/e9w4tXUlZ6jjQFDdQkCJvM15oJmkKPEDq4V75ckkcOzJkb94EzZhPdo9mjQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674363223; 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=/amXRNmT/d7ADic/jzFW66c+ytyXxhSusnj9kOLYcMA=; b=aEy5XsP8WOXD13yHCwCcw989GQLmAU4KvOIyUYFY5aaCjYk+dtMEQfiiRLz36cuXLSowNw xsN0cJbr69stDiORuSJx9faWXzQTLXOCQ2C28/vb/+z432dzygNuDJAIN/+HQwumEmw89x nzA3fTCSbYDBXeZmVgapPXmqhA6vNfm8z84kuJ8Xx6bwlcKLVxAS+TFXPozRMvM6JqOxGe i0FInFnB5Ie2OF6CiDN1cL+Er2KqrCAZy0mciOM4AS5RMLOTMIhKfoZaG1UxVEXM98tzvD z4Pjntt71NY9mP3hXU9S3ZbhIzyED7gWbO+9Hc7fXtabIqSXv23BJ2zLhtGsDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674363223; a=rsa-sha256; cv=none; b=tYXTQljBcwMZvS2EKQW63NGecNW0JziG3rk/xMAAoWSfX7GZ8K4Y53QFkPTRBZFR+gj6qS Ouuz0Euax+RACV8CzFmzqNely95Qa1Z1nQ+Bpdj2ZK3G6q/thtdIWueI+IJyAPhZx6j9Re 548eF7ZN90pgANHfH9qS/rtQnUJrCyBbGagwfH1s8sRBUBTgWx0nWLPbSn0RxwnoC9p4IW ch27yN0yngzJY/aWjCw61GUD/IRSYlQ8azyN5n515bhVDI3qUynRtd2c4D8XIuDcZ16EbD Sq0BYL5OGtn45DHBXvTxYmog8vpeSlR3SQ1va1PYoOv5jRISB7Lc4Rbt5dw/vA== 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 4P018l4FV9zcPP; Sun, 22 Jan 2023 04:53:43 +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 30M4rh6a073449; Sun, 22 Jan 2023 04:53:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30M4rhDb073448; Sun, 22 Jan 2023 04:53:43 GMT (envelope-from git) Date: Sun, 22 Jan 2023 04:53:43 GMT Message-Id: <202301220453.30M4rhDb073448@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 06012728beff - main - netpfil tests: improve pfsync_defer.py 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06012728beff45e94d58410eae7cda2ea980ef77 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=06012728beff45e94d58410eae7cda2ea980ef77 commit 06012728beff45e94d58410eae7cda2ea980ef77 Author: Kajetan Staszkiewicz AuthorDate: 2023-01-20 09:43:02 +0000 Commit: Kristof Provost CommitDate: 2023-01-22 03:26:32 +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 --- 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 75b37516762f..21cc2ed87906 100644 --- a/tests/sys/netpfil/pf/pfsync.sh +++ b/tests/sys/netpfil/pf/pfsync.sh @@ -172,7 +172,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()