mirror of https://github.com/fail2ban/fail2ban
TST: add #pragma: no cover for python version branches
Remove unused code.pull/523/head
parent
a3b758cdd3
commit
6aae276d2b
|
@ -31,7 +31,7 @@ from fail2ban.server.jail import Jail
|
||||||
from fail2ban.exceptions import UnknownJailException
|
from fail2ban.exceptions import UnknownJailException
|
||||||
try:
|
try:
|
||||||
from fail2ban.server import filtersystemd
|
from fail2ban.server import filtersystemd
|
||||||
except ImportError:
|
except ImportError: # pragma: no cover
|
||||||
filtersystemd = None
|
filtersystemd = None
|
||||||
|
|
||||||
TEST_FILES_DIR = os.path.join(os.path.dirname(__file__), "files")
|
TEST_FILES_DIR = os.path.join(os.path.dirname(__file__), "files")
|
||||||
|
@ -129,9 +129,6 @@ class TransmitterBase(unittest.TestCase):
|
||||||
cmdAdd = "add" + cmd
|
cmdAdd = "add" + cmd
|
||||||
cmdDel = "del" + cmd
|
cmdDel = "del" + cmd
|
||||||
|
|
||||||
if outValues is None:
|
|
||||||
outValues = inValues
|
|
||||||
|
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
self.transm.proceed(["get", jail, cmd]), (0, []))
|
self.transm.proceed(["get", jail, cmd]), (0, []))
|
||||||
for n, value in enumerate(inValues):
|
for n, value in enumerate(inValues):
|
||||||
|
@ -550,7 +547,7 @@ class Transmitter(TransmitterBase):
|
||||||
self.transm.proceed(["status", "INVALID", "COMMAND"])[0],1)
|
self.transm.proceed(["status", "INVALID", "COMMAND"])[0],1)
|
||||||
|
|
||||||
def testJournalMatch(self):
|
def testJournalMatch(self):
|
||||||
if not filtersystemd:
|
if not filtersystemd: # pragma: no cover
|
||||||
if sys.version_info >= (2, 7):
|
if sys.version_info >= (2, 7):
|
||||||
raise unittest.SkipTest(
|
raise unittest.SkipTest(
|
||||||
"systemd python interface not avilable")
|
"systemd python interface not avilable")
|
||||||
|
@ -650,8 +647,7 @@ class TransmitterLogging(TransmitterBase):
|
||||||
|
|
||||||
self.setGetTest("logtarget", "STDOUT")
|
self.setGetTest("logtarget", "STDOUT")
|
||||||
self.setGetTest("logtarget", "STDERR")
|
self.setGetTest("logtarget", "STDERR")
|
||||||
if sys.platform.lower().startswith('linux'):
|
self.setGetTest("logtarget", "SYSLOG")
|
||||||
self.setGetTest("logtarget", "SYSLOG")
|
|
||||||
|
|
||||||
def testLogLevel(self):
|
def testLogLevel(self):
|
||||||
self.setGetTest("loglevel", "4", 4)
|
self.setGetTest("loglevel", "4", 4)
|
||||||
|
|
Loading…
Reference in New Issue