diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2025-05-04 10:56:26 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2025-05-06 12:22:35 +0200 |
| commit | f8bd2dbbd58969371ccb5c0dbe5ac3c672a9976a (patch) | |
| tree | c7fbdea7e1f6460617fa9e1cac4da20d77c45c8d | |
| parent | bbae08827ffa324e518845ec9c43c8b85854b589 (diff) | |
| download | guix-f8bd2dbbd58969371ccb5c0dbe5ac3c672a9976a.tar.gz guix-f8bd2dbbd58969371ccb5c0dbe5ac3c672a9976a.zip | |
gnu: fail2ban: Improve snippet.
* gnu/packages/admin.scm (fail2ban)
[source]<modules>: Remove (srfi srfi-26).
<snippet>: Use gexp. Move substitute* patches...
[arguments]<phases>: ...to phases 'patch-setup.py and 'disable-some-tests.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| -rw-r--r-- | gnu/packages/admin.scm | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index e508340ef0..8fee710c7f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -6218,23 +6218,19 @@ alias cysdig=sudo csysdig --modern-bpf "'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 'build 'fix-default-config (lambda _ |