@@ -353,12 +353,12 @@ class Contact: if prevBuild: prevResult = prevBuild.getResults() - event = join((lower(self.results_descriptions.get(prevResult)), \ - 'To', \ - capitalize(self.results_descriptions.get(results))), \ - '') + required_notification_control_string = join((lower(self.results_descriptions.get(prevResult)), \ + 'To', \ + capitalize(self.results_descriptions.get(results))), \ + '') - if (self.notify_for(event)): + if (self.notify_for(required_notification_control_string)): return True return False @@ -587,11 +587,8 @@ class IRCContact(Contact): # username. self.dest = dest - def onChannel(self): - return self.dest[0] == '#' - def describeUser(self, user): - if self.onChannel(): + if self.dest[0] == '#': return "IRC user <%s> on channel %s" % (user, self.dest) return "IRC user <%s> (privmsg)" % user buildbot/status/words.py @@ -1660,14 +1660,6 @@ class IrcStatusBotTester(unittest.TestCase): channel.msgOrNotice('#here', 'hello') self.failUnlessEqual(channel.message, ['notice', '#here', 'hello']) -class IRCContactTester(unittest.TestCase): - def testOnChannel(self): - contact = words.IRCContact(MyChannel(), 'alice') - self.failUnlessEqual(contact.onChannel(), False) - - contact = words.IRCContact(MyChannel(), '#somewhere') - self.failUnlessEqual(contact.onChannel(), True) - class StepStatistics(unittest.TestCase): def testStepStatistics(self): status = builder.BuildStatus(builder.BuilderStatus("test"), 123) buildbot/test/test_status.py 95f7a0e4f86c9052236e195ead6346545db778fd KATO Kazuyoshi kzys@8-p.info http://github.com/kzys/buildbot/commit/1d591e945dfc518a2b547d387344cb539041787b 1d591e945dfc518a2b547d387344cb539041787b 2009-10-21T06:08:18-07:00 2009-10-21T06:08:18-07:00 Revert misc changes. 918a9a4e794cc7dde3d79b725ba1184780577ee6 KATO Kazuyoshi kzys@8-p.info