From c4bdc48edbbf7641ec0385e0796e31c74c86820b Mon Sep 17 00:00:00 2001 From: Steven Hiscocks Date: Sat, 6 Apr 2013 10:15:43 +0100 Subject: [PATCH] TST: Fix up tests from multiline elements broken in previous merge --- fail2ban/tests/clientreadertestcase.py | 3 ++- .../tests}/files/filter.d/testcase-common.conf | 0 {testcases => fail2ban/tests}/files/filter.d/testcase01.conf | 0 {testcases => fail2ban/tests}/files/testcase-multiline.log | 0 4 files changed, 2 insertions(+), 1 deletion(-) rename {testcases => fail2ban/tests}/files/filter.d/testcase-common.conf (100%) rename {testcases => fail2ban/tests}/files/filter.d/testcase01.conf (100%) rename {testcases => fail2ban/tests}/files/testcase-multiline.log (100%) diff --git a/fail2ban/tests/clientreadertestcase.py b/fail2ban/tests/clientreadertestcase.py index 340c9c15..99d9a50e 100644 --- a/fail2ban/tests/clientreadertestcase.py +++ b/fail2ban/tests/clientreadertestcase.py @@ -29,6 +29,7 @@ from fail2ban.client.filterreader import FilterReader from fail2ban.client.jailsreader import JailsReader from fail2ban.client.configurator import Configurator +TEST_FILES_DIR = os.path.join(os.path.dirname(__file__), "files") if os.path.exists('config/fail2ban.conf'): CONFIG_DIR='config' else: @@ -140,7 +141,7 @@ class FilterReaderTest(unittest.TestCase): ['set', 'testcase01', 'addignoreregex', "^.+ john from host 192.168.1.1\\s*$"]] filterReader = FilterReader("testcase01", "testcase01") - filterReader.setBaseDir("testcases/files/") + filterReader.setBaseDir(TEST_FILES_DIR) filterReader.read() #filterReader.getOptions(["failregex", "ignoreregex"]) filterReader.getOptions(None) diff --git a/testcases/files/filter.d/testcase-common.conf b/fail2ban/tests/files/filter.d/testcase-common.conf similarity index 100% rename from testcases/files/filter.d/testcase-common.conf rename to fail2ban/tests/files/filter.d/testcase-common.conf diff --git a/testcases/files/filter.d/testcase01.conf b/fail2ban/tests/files/filter.d/testcase01.conf similarity index 100% rename from testcases/files/filter.d/testcase01.conf rename to fail2ban/tests/files/filter.d/testcase01.conf diff --git a/testcases/files/testcase-multiline.log b/fail2ban/tests/files/testcase-multiline.log similarity index 100% rename from testcases/files/testcase-multiline.log rename to fail2ban/tests/files/testcase-multiline.log