From 62c13c15d6b4923d7b0c2611d2d8144c2402af8d Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sun, 25 Aug 2013 21:02:30 +1000 Subject: [PATCH] TST: reorder and condense error message for Multiple regexs matched --- testcases/samplestestcase.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testcases/samplestestcase.py b/testcases/samplestestcase.py index 938b9c13..c7ff0b9a 100644 --- a/testcases/samplestestcase.py +++ b/testcases/samplestestcase.py @@ -106,8 +106,9 @@ def testSampleRegexsFactory(name): self.assertTrue(faildata.get('match', False), "Line matched when shouldn't have: %s:%i %r" % (logFile.filename(), logFile.filelineno(), line)) - self.assertEqual(len(ret), 1, "Multiple regexs matched - %s:%i %r " % - (logFile.filename(), logFile.filelineno(), ret)) + self.assertEqual(len(ret), 1, "Multiple regexs matched %r - %s:%i" % + (map(lambda x: x[0], ret),logFile.filename(), logFile.filelineno())) + # Verify timestamp and host as expected failregex, host, time = ret[0] self.assertEqual(host, faildata.get("host", None))