From 5c26bcbd2b24328a4fc85be0360090ee787bf6d9 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Mon, 16 Dec 2013 10:07:41 +0000 Subject: [PATCH] TST: hopefully normalise config so that consistent test results occur on travis and locally --- testcases/clientreadertestcase.py | 4 ---- testcases/config/jail.conf | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/testcases/clientreadertestcase.py b/testcases/clientreadertestcase.py index 91689836..42c3fa28 100644 --- a/testcases/clientreadertestcase.py +++ b/testcases/clientreadertestcase.py @@ -198,13 +198,11 @@ class JailsReaderTest(LogCaptureTestCase): self.assertEqual(comm_commands, [['add', 'emptyaction', 'auto'], ['set', 'emptyaction', 'usedns', 'warn'], - ['set', 'emptyaction', 'addlogpath', '/var/log/messages'], ['set', 'emptyaction', 'maxretry', 3], ['set', 'emptyaction', 'findtime', 600], ['set', 'emptyaction', 'bantime', 600], ['add', 'special', 'auto'], ['set', 'special', 'usedns', 'warn'], - ['set', 'special', 'addlogpath', '/var/log/messages'], ['set', 'special', 'maxretry', 3], ['set', 'special', 'addfailregex', ''], ['set', 'special', 'findtime', 600], @@ -217,7 +215,6 @@ class JailsReaderTest(LogCaptureTestCase): ['set', 'missinglogfiles', 'addfailregex', ''], ['add', 'brokenaction', 'auto'], ['set', 'brokenaction', 'usedns', 'warn'], - ['set', 'brokenaction', 'addlogpath', '/var/log/messages'], ['set', 'brokenaction', 'maxretry', 3], ['set', 'brokenaction', 'findtime', 600], ['set', 'brokenaction', 'bantime', 600], @@ -234,7 +231,6 @@ class JailsReaderTest(LogCaptureTestCase): ['set', 'brokenaction', 'actioncheck', 'brokenaction', ''], ['add', 'parse_to_end_of_jail.conf', 'auto'], ['set', 'parse_to_end_of_jail.conf', 'usedns', 'warn'], - ['set', 'parse_to_end_of_jail.conf', 'addlogpath', '/var/log/messages'], ['set', 'parse_to_end_of_jail.conf', 'maxretry', 3], ['set', 'parse_to_end_of_jail.conf', 'findtime', 600], ['set', 'parse_to_end_of_jail.conf', 'bantime', 600], diff --git a/testcases/config/jail.conf b/testcases/config/jail.conf index ab791451..525308e3 100644 --- a/testcases/config/jail.conf +++ b/testcases/config/jail.conf @@ -1,6 +1,7 @@ [DEFAULT] filter = simple +logpath = /non/exist [emptyaction] enabled = true