GNU bug report logs - #78066
[PATCH 0/2] Fix fail2ban build

Previous Next

Package: guix-patches;

Reported by: Rodion Goritskov <rodion <at> goritskov.com>

Date: Fri, 25 Apr 2025 20:14:02 UTC

Severity: normal

Tags: patch

Done: Ludovic Courtès <ludo <at> gnu.org>

Bug is archived. No further changes may be made.

Full log

View this message in rfc822 format

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 78066 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>
Subject: [bug#78066] [PATCH v2 5/5] gnu: fail2ban: Improve style.
Date: Sun, 27 Apr 2025 11:08:12 +0200

* gnu/packages/admin.scm (fail2ban)[arguments]<phases>: 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 _
-- 
2.49.0
This bug report was last modified 19 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.