RF: reordered tests + enabled gamin now that its fix is pending in Debian

reference: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
pull/8/merge
Yaroslav Halchenko 2012-07-19 23:08:33 -04:00
parent c6f5d854d3
commit 481b1530d6
1 changed files with 15 additions and 18 deletions

View File

@ -119,6 +119,20 @@ tests.addTest(unittest.makeSuite(banmanagertestcase.AddFailure))
# ClientReader # ClientReader
tests.addTest(unittest.makeSuite(clientreadertestcase.JailReaderTest)) tests.addTest(unittest.makeSuite(clientreadertestcase.JailReaderTest))
# Filter
tests.addTest(unittest.makeSuite(filtertestcase.IgnoreIP))
tests.addTest(unittest.makeSuite(filtertestcase.LogFile))
tests.addTest(unittest.makeSuite(filtertestcase.LogFileMonitor))
tests.addTest(unittest.makeSuite(filtertestcase.GetFailures))
tests.addTest(unittest.makeSuite(filtertestcase.DNSUtilsTests))
# DateDetector
tests.addTest(unittest.makeSuite(datedetectortestcase.DateDetectorTest))
#
# Extensive use-tests of different available filters backends
#
from server.filterpoll import FilterPoll from server.filterpoll import FilterPoll
filters = [FilterPoll] # always available filters = [FilterPoll] # always available
@ -127,8 +141,7 @@ filters = [FilterPoll] # always available
# with good old unittest # with good old unittest
try: try:
from server.filtergamin import FilterGamin from server.filtergamin import FilterGamin
# That shmug plain doesn't work and stalls things ATM filters.append(FilterGamin)
# filters.append(FilterGamin)
except: except:
pass pass
@ -142,22 +155,6 @@ for Filter_ in filters:
tests.addTest(unittest.makeSuite( tests.addTest(unittest.makeSuite(
filtertestcase.get_monitor_failures_testcase(Filter_))) filtertestcase.get_monitor_failures_testcase(Filter_)))
# yoh: adding them (in particular datadetectortestscase before above
# get_monitor_failures_testcase's makes them fail (probably due
# to additional thread making it busier or smth like
# that)... TODO
# Filter
tests.addTest(unittest.makeSuite(filtertestcase.IgnoreIP))
tests.addTest(unittest.makeSuite(filtertestcase.LogFile))
tests.addTest(unittest.makeSuite(filtertestcase.LogFileMonitor))
tests.addTest(unittest.makeSuite(filtertestcase.GetFailures))
tests.addTest(unittest.makeSuite(filtertestcase.DNSUtilsTests))
# DateDetector
tests.addTest(unittest.makeSuite(datedetectortestcase.DateDetectorTest))
# #
# Run the tests # Run the tests