Merge pull request #111 from opoplawski/nonettest

Initial support for --no-network option for fail2ban-testcases (Closes gh-110)
pull/115/head
Yaroslav Halchenko 2013-01-25 16:45:01 -08:00
commit c900c08eed
1 changed files with 11 additions and 4 deletions

View File

@ -53,6 +53,12 @@ def get_opt_parser():
help="Log level for the logger to use during running tests"), help="Log level for the logger to use during running tests"),
]) ])
p.add_options([
Option('-n', "--no-network", action="store_true",
dest="no_network",
help="Do not run tests that require the network"),
])
return p return p
parser = get_opt_parser() parser = get_opt_parser()
@ -90,7 +96,6 @@ else:
stdout.setFormatter(logging.Formatter(' %(message)s')) stdout.setFormatter(logging.Formatter(' %(message)s'))
logSys.addHandler(stdout) logSys.addHandler(stdout)
# #
# Let know the version # Let know the version
# #
@ -129,9 +134,11 @@ tests.addTest(unittest.makeSuite(banmanagertestcase.AddFailure))
tests.addTest(unittest.makeSuite(clientreadertestcase.JailReaderTest)) tests.addTest(unittest.makeSuite(clientreadertestcase.JailReaderTest))
# Filter # Filter
if not opts.no_network:
tests.addTest(unittest.makeSuite(filtertestcase.IgnoreIP)) tests.addTest(unittest.makeSuite(filtertestcase.IgnoreIP))
tests.addTest(unittest.makeSuite(filtertestcase.LogFile)) tests.addTest(unittest.makeSuite(filtertestcase.LogFile))
tests.addTest(unittest.makeSuite(filtertestcase.LogFileMonitor)) tests.addTest(unittest.makeSuite(filtertestcase.LogFileMonitor))
if not opts.no_network:
tests.addTest(unittest.makeSuite(filtertestcase.GetFailures)) tests.addTest(unittest.makeSuite(filtertestcase.GetFailures))
tests.addTest(unittest.makeSuite(filtertestcase.DNSUtilsTests)) tests.addTest(unittest.makeSuite(filtertestcase.DNSUtilsTests))
tests.addTest(unittest.makeSuite(filtertestcase.JailTests)) tests.addTest(unittest.makeSuite(filtertestcase.JailTests))