From ec6032d934f72fc2a373a630e44499505b561519 Mon Sep 17 00:00:00 2001 From: sebres Date: Thu, 12 May 2016 17:16:09 +0200 Subject: [PATCH] prevent to fail stock configs test case, if any jail custom config does not have own test log-file (perhaps not clean copy) --- fail2ban/tests/servertestcase.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fail2ban/tests/servertestcase.py b/fail2ban/tests/servertestcase.py index 90f7aaf2..b79a5652 100644 --- a/fail2ban/tests/servertestcase.py +++ b/fail2ban/tests/servertestcase.py @@ -1021,7 +1021,11 @@ class ServerConfigReaderTests(LogCaptureTestCase): cmd[2] = 'polling' # change log path to test log of jail (to prevent "Permission denied" on /var/logs/ for test-user): elif len(cmd) > 3 and cmd[0] == 'set' and cmd[2] == 'addlogpath': - cmd[3] = os.path.join(TEST_FILES_DIR, 'logs', cmd[1]) + fn = os.path.join(TEST_FILES_DIR, 'logs', cmd[1]) + # fallback to testcase01 if jail has not an own test log-file (currently should be no matter): + if not os.path.exists(fn): # pragma: no cover + fn = os.path.join(TEST_FILES_DIR, 'testcase01.log') + cmd[3] = fn # if fast add dummy regex to prevent too long compile of all regexp (we don't use it in this test at all): elif unittest.F2B.fast and ( len(cmd) > 3 and cmd[0] in ('set', 'multi-set') and cmd[2] == 'addfailregex'