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

Merge pull request #1349 from yarikoptic/bf-tests-use-configdir 

BF: use tests.utils.CONFIG_DIR instead of fixed one (Closes #1348)
pull/1359/head
Yaroslav Halchenko 2016-03-08 09:11:34 -05:00
parent 634e68036e bb0dc17a87
commit d533c0761d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fail2ban/tests/fail2banregextestcase.py
View File

@ -40,6 +40,7 @@ except ImportError:
from ..client import fail2banregex from ..client import fail2banregex
from ..client.fail2banregex import Fail2banRegex, get_opt_parser, output from ..client.fail2banregex import Fail2banRegex, get_opt_parser, output
from .utils import LogCaptureTestCase, logSys from .utils import LogCaptureTestCase, logSys
from .utils import CONFIG_DIR
fail2banregex.logSys = logSys fail2banregex.logSys = logSys
@ -48,8 +49,6 @@ def _test_output(*args):
fail2banregex.output = _test_output fail2banregex.output = _test_output
CONF_FILES_DIR = os.path.abspath(
os.path.join(os.path.dirname(__file__),"..", "..", "config"))
TEST_FILES_DIR = os.path.join(os.path.dirname(__file__), "files") TEST_FILES_DIR = os.path.join(os.path.dirname(__file__), "files")
@ -66,7 +65,7 @@ class Fail2banRegexTest(LogCaptureTestCase):
FILENAME_02 = os.path.join(TEST_FILES_DIR, "testcase02.log") FILENAME_02 = os.path.join(TEST_FILES_DIR, "testcase02.log")
FILENAME_WRONGCHAR = os.path.join(TEST_FILES_DIR, "testcase-wrong-char.log") FILENAME_WRONGCHAR = os.path.join(TEST_FILES_DIR, "testcase-wrong-char.log")
FILTER_SSHD = os.path.join(CONF_FILES_DIR, 'filter.d', 'sshd.conf') FILTER_SSHD = os.path.join(CONFIG_DIR, 'filter.d', 'sshd.conf')
def setUp(self): def setUp(self):
"""Call before every test case.""" """Call before every test case."""