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

split new test to 2 tests (allows to cover `_globJournalFiles` even if system-journal is not available)

pull/3927/merge
sebres 2025-03-30 20:13:39 +02:00
parent 4eef68b3d3
commit 5a2fd9b31c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fail2ban/tests/filtertestcase.py
View File

@ -32,7 +32,7 @@ import tempfile
import uuid import uuid
try: try:
from systemd import journal from ..server.filtersystemd import journal, _globJournalFiles
except ImportError: except ImportError:
journal = None journal = None
@ -1510,11 +1510,8 @@ def get_monitor_failures_journal_testcase(Filter_): # pragma: systemd no cover
return MonitorJournalFailures._runtimeJournal return MonitorJournalFailures._runtimeJournal
raise unittest.SkipTest('systemd journal seems to be not available (e. g. no rights to read)') raise unittest.SkipTest('systemd journal seems to be not available (e. g. no rights to read)')
@with_tmpdir def testGlobJournal_System(self):
def testGlobJournal(self, tmp): if not journal: # pragma: no cover
try:
from ..server.filtersystemd import journal, _globJournalFiles
except ImportError: # pragma: no cover
raise unittest.SkipTest("systemd python interface not available") raise unittest.SkipTest("systemd python interface not available")
jrnlfile = self._getRuntimeJournal() jrnlfile = self._getRuntimeJournal()
jrnlpath = os.path.dirname(jrnlfile) jrnlpath = os.path.dirname(jrnlfile)
@ -1522,6 +1519,11 @@ def get_monitor_failures_journal_testcase(Filter_): # pragma: systemd no cover
self.assertIn(jrnlfile, _globJournalFiles(journal.SYSTEM_ONLY, jrnlpath)) self.assertIn(jrnlfile, _globJournalFiles(journal.SYSTEM_ONLY, jrnlpath))
self.assertIn(jrnlfile, _globJournalFiles(journal.LOCAL_ONLY)) self.assertIn(jrnlfile, _globJournalFiles(journal.LOCAL_ONLY))
self.assertIn(jrnlfile, _globJournalFiles(journal.LOCAL_ONLY, jrnlpath)) self.assertIn(jrnlfile, _globJournalFiles(journal.LOCAL_ONLY, jrnlpath))
@with_tmpdir
def testGlobJournal(self, tmp):
if not journal: # pragma: no cover
raise unittest.SkipTest("systemd python interface not available")
# no files yet in temp-path: # no files yet in temp-path:
self.assertFalse(_globJournalFiles(None, tmp)) self.assertFalse(_globJournalFiles(None, tmp))
# test against temp-path, shall ignore all rotated files: # test against temp-path, shall ignore all rotated files: