From b248cb2c5bcd00f430b51739d1b539cf75932133 Mon Sep 17 00:00:00 2001 From: Emilio Perez Date: Wed, 21 Jun 2017 08:33:32 +0100 Subject: [PATCH] implemented assertNotLogged in LoggingMixin --- master/buildbot/test/util/logging.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/master/buildbot/test/util/logging.py b/master/buildbot/test/util/logging.py index f41c76fab01..892467ec26a 100644 --- a/master/buildbot/test/util/logging.py +++ b/master/buildbot/test/util/logging.py @@ -28,16 +28,24 @@ def setUpLogging(self): log.addObserver(self._logEvents.append) self.addCleanup(log.removeObserver, self._logEvents.append) - def assertLogged(self, regexp): + def logContainsMessage(self, regexp): r = re.compile(regexp) for event in self._logEvents: msg = log.textFromEventDict(event) if msg is not None: assert not msg.startswith("Unable to format event"), msg if msg is not None and r.search(msg): - return - self.fail( - "%r not matched in log output.\n%s " % ( + return True + return False + + def assertLogged(self, regexp): + if not self.logContainsMessage(regexp): + self.fail("%r not matched in log output.\n%s " % ( + regexp, [log.textFromEventDict(e) for e in self._logEvents])) + + def assertNotLogged(self, regexp): + if self.logContainsMessage(regexp): + self.fail("%r matched in log output.\n%s " % ( regexp, [log.textFromEventDict(e) for e in self._logEvents])) def assertWasQuiet(self):