From bf021ebd97719c9a1b7436366f4379f3d86d71ed Mon Sep 17 00:00:00 2001 From: Steven Hiscocks Date: Fri, 26 Jul 2013 17:05:17 +0100 Subject: [PATCH] TST: Mandate that all filters and each regex has sample log entry --- testcases/samplestestcase.py | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/testcases/samplestestcase.py b/testcases/samplestestcase.py index dd478fbf..54afc864 100644 --- a/testcases/samplestestcase.py +++ b/testcases/samplestestcase.py @@ -72,14 +72,9 @@ def testSampleRegexsFactory(name): # No fail regexs set: likely just common file for includes. return - # TODO: Remove exception handling once sample logs obtained for all - try: - self.assertTrue( - os.path.isfile(os.path.join(TEST_FILES_DIR, "logs", name)), - "No sample log file available for '%s' filter" % name) - except AssertionError: - print "I: No sample log file available for '%s' filter" % name - return + self.assertTrue( + os.path.isfile(os.path.join(TEST_FILES_DIR, "logs", name)), + "No sample log file available for '%s' filter" % name) logFile = fileinput.FileInput( os.path.join(TEST_FILES_DIR, "logs", name)) @@ -124,14 +119,10 @@ def testSampleRegexsFactory(name): # TODO: Remove exception handling once all regexs have samples for failRegexIndex, failRegex in enumerate(self.filter.getFailRegex()): - try: - self.assertTrue( - failRegexIndex in regexsUsed, - "Regex for filter '%s' has no samples: %i: %r" % - (name, failRegexIndex, failRegex)) - except AssertionError: - print "I: Regex for filter '%s' has no samples: %i: %r" % ( - name, failRegexIndex, failRegex) + self.assertTrue( + failRegexIndex in regexsUsed, + "Regex for filter '%s' has no samples: %i: %r" % + (name, failRegexIndex, failRegex)) return testFilter