From patchwork Sun Apr 27 09:08:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42041 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7617427BC4B; Sun, 27 Apr 2025 10:10:59 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 04BF627BC49 for ; Sun, 27 Apr 2025 10:10:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8y1d-00046M-A1; Sun, 27 Apr 2025 05:10:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u8y1W-00042l-DJ for guix-patches@gnu.org; Sun, 27 Apr 2025 05:10:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8y1V-0002y9-0R for guix-patches@gnu.org; Sun, 27 Apr 2025 05:10:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=4ZhHEIxb5z7W9LTdYsxs0CHUamVffevnm84u3+keLOk=; b=aV0q78j5sw7boEmz9Jclmn1XGElvhiz3zdyDcwqsHBmeGJfUiPGrMbBMTpydSVlpTYwTaCD0w9UthqSNY5cyxQqmTyqyCr3UYGt2R750JojPoSHg7erQ7VSDcVA/UiOGQhh6V0qhAaVlmeHdTKVuOaCZxZVg0XOjuU5aOxTnNAvH5y60ukeOZtqCgGepd4n5zenGLVjQnrYv2WUQUyj67Zu1JrhSCi0o90hnMq2rtc0lsDvLijfUnVvbK3vABUI2Uokr5PTk6vAjJ/faCHjCUVgDFhFnOZz483qG5dTnofgkdisiyF5rwQI82A0Aaax9Bn1qkZ8H5fPFcXKL42vnLw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u8y1U-0002Jx-Q3 for guix-patches@gnu.org; Sun, 27 Apr 2025 05:10:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78066] [PATCH v2 5/5] gnu: fail2ban: Improve style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Apr 2025 09:10:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78066 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78066@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78066-submit@debbugs.gnu.org id=B78066.17457449938855 (code B ref 78066); Sun, 27 Apr 2025 09:10:04 +0000 Received: (at 78066) by debbugs.gnu.org; 27 Apr 2025 09:09:53 +0000 Received: from localhost ([127.0.0.1]:38999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u8y1I-0002Ik-J6 for submit@debbugs.gnu.org; Sun, 27 Apr 2025 05:09:52 -0400 Received: from 6.mo563.mail-out.ovh.net ([46.105.55.200]:55877) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u8y19-0002Hr-GQ for 78066@debbugs.gnu.org; Sun, 27 Apr 2025 05:09:44 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4Zlgkt04Dgz1XJJ; Sun, 27 Apr 2025 09:09:42 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78066@debbugs.gnu.org>; Sun, 27 Apr 2025 09:09:41 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.113.125]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4Zlgks6hhtzyCg; Sun, 27 Apr 2025 09:09:41 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.6]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 62063BA3F3A; Sun, 27 Apr 2025 09:09:41 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-97G002a89c58dd-0d1a-4b66-a7b5-5fc50c7d6c93, 9AB25D737CCC7858AAE0948041C432A519AE1DDE) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 89.207.171.153 Date: Sun, 27 Apr 2025 11:08:12 +0200 Message-ID: <20250427090915.11846-6-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250427090915.11846-1-ngraves@ngraves.fr> References: <20250427090915.11846-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 17605978322293285602 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvheejieekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekledrvddtjedrudejuddrudehfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeektdeiieesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=4ZhHEIxb5z7W9LTdYsxs0CHUamVffevnm84u3+keLOk=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1745744982; v=1; b=iLxnFvnP2iS1uFVz5DlaMLkN8mc6bxPdmOQs8lGaDCgOlwEQswWxAwhAnI5PYNPIoZ35ztu1 ke9k7bS//o0R4v0OdFJ3qBpcIRoqUrWkDJpjUTRYnfM096TgrJGkBv2rwz5cGRpRlyNdg054EUe Ym3XUv6bExt+MpqaoQ9NeMnKo5IYMHu2kW5J54PdskVmBP9x7fSH1kR7j4l3SPZV6dWb/oirKM7 0bkKhERES/co/+UXrRkZiauzyHXSD/Qj3nbXOmgc4BITroYjvl9lBhjcChfEzLdkJ8tavD3FXLC Q1Jvwe1nR4ucz88lxdVQmbIjVy3Qof2ZL0Wr9lUtHDIYg== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/admin.scm (fail2ban)[arguments]: Rewrite phase 'disable-some-tests. --- gnu/packages/admin.scm | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 25bce63aaf..777d0abb47 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -6299,23 +6299,19 @@ (define-public fail2ban "'usr/share/doc/fail2ban'")))) (add-after 'unpack 'disable-some-tests (lambda _ - (define (make-suite str) - (string-append "tests.addTest\\(loadTests\\(" str "\\)\\)")) + (define (make-suite-regex tests) + (string-append "tests.addTest\\(loadTests\\((" + (string-join tests "|") + ")\\)\\)")) ;; disable tests performing unacceptable side-effects (substitute* "fail2ban/tests/utils.py" - (((make-suite "actiontestcase.CommandActionTest")) - "") - (((make-suite "misctestcase.SetupTest")) - "") - (((make-suite "filtertestcase.DNSUtilsNetworkTests")) - "") - (((make-suite "filtertestcase.IgnoreIPDNS")) - "") - (((make-suite "filtertestcase.GetFailures")) - "") - (((make-suite "fail2banclienttestcase.Fail2banServerTest")) - "") - (((make-suite "servertestcase.ServerConfigReaderTests")) + (((make-suite-regex (list "actiontestcase.CommandActionTest" + "misctestcase.SetupTest" + "filtertestcase.DNSUtilsNetworkTests" + "filtertestcase.IgnoreIPDNS" + "filtertestcase.GetFailures" + "fail2banclienttestcase.Fail2banServerTest" + "servertestcase.ServerConfigReaderTests"))) "")))) (add-before 'install 'fix-default-config (lambda _