github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

prevent to fail stock configs test case, if any jail custom config does not have own test log-file (perhaps not clean copy)

pull/1415/head
sebres 2016-05-12 17:16:09 +02:00
parent 4b5b16cd9f
commit ec6032d934
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fail2ban/tests/servertestcase.py
View File

@ -1021,7 +1021,11 @@ class ServerConfigReaderTests(LogCaptureTestCase):
cmd[2] = 'polling' cmd[2] = 'polling'
# change log path to test log of jail (to prevent "Permission denied" on /var/logs/ for test-user): # 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': 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): # 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 ( elif unittest.F2B.fast and (
len(cmd) > 3 and cmd[0] in ('set', 'multi-set') and cmd[2] == 'addfailregex' len(cmd) > 3 and cmd[0] in ('set', 'multi-set') and cmd[2] == 'addfailregex'