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

Merge branch '0.10' into 0.11

pull/2030/merge
sebres 2018-01-24 20:36:22 +01:00
parent faab77cc79 5f3ba289d6
commit 4942578de0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fail2ban/tests/filtertestcase.py
View File

@ -673,10 +673,10 @@ class LogFileMonitor(LogCaptureTestCase):
failure_was_logged = self._is_logged('Unable to open %s' % self.name) failure_was_logged = self._is_logged('Unable to open %s' % self.name)
# verify that we cannot access the file. Checking by name of user is not # verify that we cannot access the file. Checking by name of user is not
# sufficient since could be a fakeroot or some other super-user # sufficient since could be a fakeroot or some other super-user
is_root = True
try: try:
with open(self.name) as f: with open(self.name) as f: # pragma: no cover - normally no root
f.read() f.read()
is_root = True
except IOError: except IOError:
is_root = False is_root = False

2
fail2ban/tests/utils.py
View File

@ -56,7 +56,7 @@ if not CONFIG_DIR:
# Use heuristic to figure out where configuration files are # Use heuristic to figure out where configuration files are
if os.path.exists(os.path.join('config','fail2ban.conf')): if os.path.exists(os.path.join('config','fail2ban.conf')):
CONFIG_DIR = 'config' CONFIG_DIR = 'config'
else: else: # pragma: no cover - normally unreachable
CONFIG_DIR = '/etc/fail2ban' CONFIG_DIR = '/etc/fail2ban'
# Indicates that we've stock config: # Indicates that we've stock config: