From 6aae276d2b46ba8f5e769c5224bc6cd10d516e2b Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Fri, 27 Dec 2013 11:07:11 +0000 Subject: [PATCH] TST: add #pragma: no cover for python version branches Remove unused code. --- fail2ban/tests/servertestcase.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/fail2ban/tests/servertestcase.py b/fail2ban/tests/servertestcase.py index 26ff8e0a..a9016737 100644 --- a/fail2ban/tests/servertestcase.py +++ b/fail2ban/tests/servertestcase.py @@ -31,7 +31,7 @@ from fail2ban.server.jail import Jail from fail2ban.exceptions import UnknownJailException try: from fail2ban.server import filtersystemd -except ImportError: +except ImportError: # pragma: no cover filtersystemd = None TEST_FILES_DIR = os.path.join(os.path.dirname(__file__), "files") @@ -129,9 +129,6 @@ class TransmitterBase(unittest.TestCase): cmdAdd = "add" + cmd cmdDel = "del" + cmd - if outValues is None: - outValues = inValues - self.assertEqual( self.transm.proceed(["get", jail, cmd]), (0, [])) for n, value in enumerate(inValues): @@ -550,7 +547,7 @@ class Transmitter(TransmitterBase): self.transm.proceed(["status", "INVALID", "COMMAND"])[0],1) def testJournalMatch(self): - if not filtersystemd: + if not filtersystemd: # pragma: no cover if sys.version_info >= (2, 7): raise unittest.SkipTest( "systemd python interface not avilable") @@ -650,8 +647,7 @@ class TransmitterLogging(TransmitterBase): self.setGetTest("logtarget", "STDOUT") self.setGetTest("logtarget", "STDERR") - if sys.platform.lower().startswith('linux'): - self.setGetTest("logtarget", "SYSLOG") + self.setGetTest("logtarget", "SYSLOG") def testLogLevel(self): self.setGetTest("loglevel", "4", 4)