Skip to content

Commit

Permalink
pyflakes + autopep8
Browse files Browse the repository at this point in the history
  • Loading branch information
@djmitche
djmitche committed Apr 21, 2014
1 parent b66ea4c commit b957951
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 57 deletions.
64 changes: 32 additions & 32 deletions master/buildbot/status/words.py
View file
Expand Up @@ -29,7 +29,6 @@
from twisted.python import log
from twisted.python import usage
from twisted.words.protocols import irc
from zope.interface import implements

from buildbot import config
from buildbot import interfaces
Expand Down Expand Up @@ -144,6 +143,7 @@ def started(self, s):


class IRCContact(base.StatusReceiver):

"""I hold the state for a single user's interaction with the buildbot.
There will be one instance of me for each user who interacts personally
Expand Down Expand Up @@ -191,13 +191,13 @@ def doSilly(self, message):
def getBuilder(self, buildername=None, builderid=None):
if buildername:
bdicts = yield self.master.data.get(('builders',),
filters=[resultspec.Filter('name', 'eq', [buildername])])
filters=[resultspec.Filter('name', 'eq', [buildername])])
if bdicts:
bdict = bdicts[0] # Could there be more than one? One is enough.
else:
bdict = None
elif builderid:
bdict = yield self.master.data.get(('builders',builderid))
bdict = yield self.master.data.get(('builders', builderid))
else:
raise UsageError("no builder specified")

Expand Down Expand Up @@ -233,12 +233,12 @@ def getOnlineBuilders(self):
if not connected:
continue
builders = buildslave['configured_on']
builderids = [ builder['builderid'] for builder in builders ]
builderids = [builder['builderid'] for builder in builders]
online_builderids.update(builderids)
defer.returnValue(list(online_builderids))

@defer.inlineCallbacks
def getRevisionsForBuild(bdict):
def getRevisionsForBuild(self, bdict):
# FIXME: Need to get revision info! (build -> buildreq -> buildset -> sourcestamps)
defer.returnValue(["TODO"])

Expand Down Expand Up @@ -340,9 +340,8 @@ def subscribe_to_build_events(self):
# -- builderStarted
# -- buildFinished


handle = True #self.master.data.startConsuming(watchForCompleteEvent, {},
# (build['link'].path))
handle = True # self.master.data.startConsuming(watchForCompleteEvent, {},
# (build['link'].path))
self.subscribed.append(handle)

def unsubscribe_from_build_events(self):
Expand Down Expand Up @@ -407,16 +406,17 @@ def command_NOTIFY(self, args, who):

def getRunningBuilds(self, builderid):
d = self.master.data.get(('builds',),
filters=[resultspec.Filter('builderid', 'eq', [builderid]),
resultspec.Filter('complete', 'eq', [False])])
filters=[resultspec.Filter('builderid', 'eq', [builderid]),
resultspec.Filter('complete', 'eq', [False])])
return d

def getLastCompletedBuild(self, builderid):
d = self.master.data.get(('builds',),
filters=[resultspec.Filter('builderid', 'eq', [builderid]),
resultspec.Filter('complete', 'eq', [True])],
order=['-number'],
limit=1)
filters=[resultspec.Filter('builderid', 'eq', [builderid]),
resultspec.Filter('complete', 'eq', [True])],
order=['-number'],
limit=1)

@d.addCallback
def listAsOneOrNone(res):
if res:
Expand All @@ -430,7 +430,7 @@ def command_WATCH(self, args, who):
args = self.splitArgs(args)
if len(args) != 1:
raise UsageError("try 'watch <builder>'")

which = args[0]
builder = yield self.getBuilder(buildername=which)

Expand All @@ -445,7 +445,7 @@ def watchForCompleteEvent(key, msg):
return self.watchedBuildFinished(msg)

for build in builds:
handle = self.master.data.startConsuming(watchForCompleteEvent, {},
handle = self.master.data.startConsuming(watchForCompleteEvent, {},
('builds', str(build['buildid'])))
self.build_subscriptions.append((build['buildid'], handle))

Expand All @@ -461,7 +461,7 @@ def watchForCompleteEvent(key, msg):
self.send(r)
command_WATCH.usage = "watch <which> - announce the completion of an active build"

## OLD_STYLE
# OLD_STYLE
def builderAdded(self, builderName, builder):
# FIXME: NEED TO THINK ABOUT!
if (self.bot.tags is not None and
Expand All @@ -471,12 +471,12 @@ def builderAdded(self, builderName, builder):
log.msg('[Contact] Builder %s added' % (builderName))
builder.subscribe(self)

## OLD_STYLE
# OLD_STYLE
def builderRemoved(self, builderName):
# FIXME: NEED TO THINK ABOUT!
log.msg('[Contact] Builder %s removed' % (builderName))

## OLD_STYLE
# OLD_STYLE
@defer.inlineCallbacks
def buildStarted(self, builderName, build):
# FIXME: NEED TO THINK ABOUT!
Expand All @@ -486,7 +486,7 @@ def buildStarted(self, builderName, build):
# only notify about builders we are interested in

if (self.bot.tags is not None and
not builder.matchesAnyTag(tags=self.bot.tags)):
not builder.matchesAnyTag(tags=self.bot.tags)):
log.msg('Not notifying for a build that does not match any tags')
return

Expand Down Expand Up @@ -531,7 +531,7 @@ def buildStarted(self, builderName, build):
def getResultsDescriptionAndColor(self, results):
return self.results_descriptions.get(results, ("??", 'RED'))

## OLD_STYLE
# OLD_STYLE
def buildFinished(self, builderName, build, results):
# FIXME: NEED TO THINK ABOUT!
builder = build.getBuilder()
Expand All @@ -550,6 +550,7 @@ def buildFinished(self, builderName, build, results):
if not self.shouldReportBuild(builder_name, buildnum):
return

bdict = None # ???
if self.useRevisions:
revisions = yield self.getRevisionsForBuild(bdict)
r = "build containing revision(s) [%s] on %s is complete: %s" % \
Expand Down Expand Up @@ -621,7 +622,7 @@ def watchedBuildFinished(self, build):
self.send(r)

# FIXME: where do we get the base_url? Then do we use the build Link to make the URL?
buildurl = None # self.bot.status.getBuildbotURL() + build
buildurl = None # self.bot.status.getBuildbotURL() + build
if buildurl:
self.send("Build details are at %s" % buildurl)

Expand Down Expand Up @@ -683,11 +684,11 @@ def command_FORCE(self, args, who):

reason = u"forced: by %s: %s" % (self.describeUser(who), reason)
d = self.master.data.updates.addBuildset(builderNames=[builderName],
scheduler=u"IRC", # For now, we just use this as the id.
sourcestamps=[{'branch': branch, 'revision': revision}],
reason=reason,
properties=properties.asDict(),
waited_for=False)
scheduler=u"IRC", # For now, we just use this as the id.
sourcestamps=[{'branch': branch, 'revision': revision}],
reason=reason,
properties=properties.asDict(),
waited_for=False)

def subscribe(xxx_todo_changeme):
(bsid, brids) = xxx_todo_changeme
Expand Down Expand Up @@ -740,9 +741,9 @@ def command_STOP(self, args, who):

def getCurrentBuildstep(self, build):
d = self.master.data.get(('builds', build['buildid'], 'steps'),
filters=[resultspec.Filter('complete', 'eq', [False])],
order=['number'],
limit=1)
filters=[resultspec.Filter('complete', 'eq', [False])],
order=['number'],
limit=1)
return d

@defer.inlineCallbacks
Expand Down Expand Up @@ -947,8 +948,7 @@ def act(self, action):
def getCommandMethod(self, command):
return getattr(self, 'command_' + command.upper(), None)


## FIXME: this returns a deferred, but nothing uses it!
# FIXME: this returns a deferred, but nothing uses it!
def handleMessage(self, message, who):
# a message has arrived from 'who'. For broadcast contacts (i.e. when
# people do an irc 'buildbot: command'), this will be a string
Expand Down
47 changes: 22 additions & 25 deletions master/buildbot/test/unit/test_status_words.py
View file
Expand Up @@ -17,8 +17,8 @@

from buildbot.status import words
from buildbot.status.results import SUCCESS
from buildbot.test.fake import fakemaster
from buildbot.test.fake import fakedb
from buildbot.test.fake import fakemaster
from buildbot.test.util import compat
from buildbot.test.util import config
from buildbot.util import datetime2epoch
Expand All @@ -28,10 +28,11 @@
from twisted.internet import task
from twisted.trial import unittest


class TestIrcContactChannel(unittest.TestCase):

BUILDER_NAMES = [u'builder1', u'builder2']
BUILDER_IDS = [23, 45]
BUILDER_IDS = [23, 45]

def setUp(self):
self.master = fakemaster.make_master(testcase=self, wantMq=True,
Expand All @@ -41,7 +42,7 @@ def setUp(self):
self.master.db.builders.addTestBuilder(builderid=builderid, name=name)

# I think the 'bot' part of this is actually going away ...
## TO REMOVE:
# TO REMOVE:

self.bot = mock.Mock(name='IRCStatusBot-instance')
self.bot.nickname = 'nick'
Expand Down Expand Up @@ -280,8 +281,7 @@ def test_command_list_builders(self):
yield self.do_test_command('list', args='builders')
self.assertEqual(len(self.sent), 1)
for builder in self.BUILDER_NAMES:
self.assertIn('%s [offline]'%builder, self.sent[0])

self.assertIn('%s [offline]' % builder, self.sent[0])

def setup_multi_builders(self):
# Make first builder configured, but not connected
Expand All @@ -292,9 +292,9 @@ def setup_multi_builders(self):
fakedb.BuilderMaster(id=4012, masterid=13, builderid=self.BUILDER_IDS[0]),
fakedb.BuilderMaster(id=4013, masterid=13, builderid=self.BUILDER_IDS[1]),
fakedb.ConfiguredBuildslave(id=14013,
buildslaveid=2, buildermasterid=4012),
buildslaveid=2, buildermasterid=4012),
fakedb.ConfiguredBuildslave(id=14013,
buildslaveid=1, buildermasterid=4013),
buildslaveid=1, buildermasterid=4013),
])

@defer.inlineCallbacks
Expand All @@ -303,8 +303,8 @@ def test_command_list_builders_not_connected(self):

yield self.do_test_command('list', args='builders')
self.assertEqual(len(self.sent), 1)
self.assertIn('%s [offline]'%self.BUILDER_NAMES[0], self.sent[0])
self.assertIn('%s [offline]'%self.BUILDER_NAMES[1], self.sent[0])
self.assertIn('%s [offline]' % self.BUILDER_NAMES[0], self.sent[0])
self.assertIn('%s [offline]' % self.BUILDER_NAMES[1], self.sent[0])

@defer.inlineCallbacks
def test_command_list_builders_connected(self):
Expand All @@ -317,8 +317,8 @@ def test_command_list_builders_connected(self):

yield self.do_test_command('list', args='builders')
self.assertEqual(len(self.sent), 1)
self.assertIn('%s [offline]'%self.BUILDER_NAMES[0], self.sent[0])
self.assertNotIn('%s [offline]'%self.BUILDER_NAMES[1], self.sent[0])
self.assertIn('%s [offline]' % self.BUILDER_NAMES[0], self.sent[0])
self.assertNotIn('%s [offline]' % self.BUILDER_NAMES[1], self.sent[0])

@defer.inlineCallbacks
def test_command_status(self):
Expand Down Expand Up @@ -346,7 +346,6 @@ def test_command_status_builder0_running(self):
def test_command_status_bogus(self):
yield self.do_test_command('status', args='bogus_builder', exp_UsageError=True)


@defer.inlineCallbacks
def test_command_last(self):
self.setupSomeBuilds()
Expand Down Expand Up @@ -387,19 +386,19 @@ def setupSomeBuilds(self):
self.master.db.insertTestData([
# Three builds on builder#0, One build on builder#1
fakedb.Build(id=13, masterid=88, buildslaveid=13,
builderid=self.BUILDER_IDS[0],
builderid=self.BUILDER_IDS[0],
buildrequestid=82, number=3),
fakedb.Build(id=14, masterid=88, buildslaveid=13,
builderid=self.BUILDER_IDS[0],
builderid=self.BUILDER_IDS[0],
buildrequestid=83, number=4),
fakedb.Build(id=15, masterid=88, buildslaveid=13,
builderid=self.BUILDER_IDS[1],
builderid=self.BUILDER_IDS[1],
buildrequestid=84, number=5),
fakedb.Build(id=16, masterid=88, buildslaveid=13,
builderid=self.BUILDER_IDS[0],
builderid=self.BUILDER_IDS[0],
buildrequestid=85, number=6),
])
self.master.db.builds.finishBuild(buildid=14, results='results')
self.master.db.builds.finishBuild(buildid=14, results='results')

@defer.inlineCallbacks
def test_command_watch_builder0(self):
Expand All @@ -422,7 +421,7 @@ def test_command_watch_builder0_get_notifications(self):
@defer.inlineCallbacks
def sendBuildFinishedMessage(self, buildid, results=0):
self.master.db.builds.finishBuild(buildid=buildid, results=SUCCESS)
build = yield self.master.db.builds.getBuild(buildid)
build = yield self.master.db.builds.getBuild(buildid)
self.master.mq.callConsumer(('builds', str(buildid), 'complete'),
dict(
buildid=buildid,
Expand All @@ -436,7 +435,7 @@ def sendBuildFinishedMessage(self, buildid, results=0):
complete_at=datetime2epoch(build['complete_at']),
state_strings=[],
results=results,
))
))

@defer.inlineCallbacks
def test_command_stop(self):
Expand All @@ -448,19 +447,18 @@ def test_command_stop_bogus_builder(self):

@defer.inlineCallbacks
def test_command_stop_builder0_no_builds(self):
yield self.do_test_command('stop', args="build %s 'i have a reason'"%self.BUILDER_NAMES[0])
yield self.do_test_command('stop', args="build %s 'i have a reason'" % self.BUILDER_NAMES[0])
self.assertEqual(len(self.sent), 1)
self.assertIn('no build is', self.sent[0])

@defer.inlineCallbacks
def test_command_stop_builder0_1_builds(self):
self.setupSomeBuilds()
yield self.do_test_command('stop', args="build %s 'i have a reason'"%self.BUILDER_NAMES[0])
yield self.do_test_command('stop', args="build %s 'i have a reason'" % self.BUILDER_NAMES[0])
self.assertEqual(len(self.sent), 2)
self.assertIn('build 3 interrupted', self.sent)
self.assertIn('build 6 interrupted', self.sent)


@defer.inlineCallbacks
def test_command_force_no_args(self):
yield self.do_test_command('force', exp_UsageError=True)
Expand All @@ -480,11 +478,10 @@ def test_command_force_build_no_args(self):
# TODO: the below fails due to the assertion (see "rewrite to not use the status hierarchy")
# @defer.inlineCallbacks
# def test_command_force(self):
# yield self.do_test_command('force',
# args='build --branch BRANCH1 --revision REV1 --props=PROP1=VALUE1 %s REASON'
# yield self.do_test_command('force',
# args='build --branch BRANCH1 --revision REV1 --props=PROP1=VALUE1 %s REASON'
# % self.BUILDER_NAMES[0])


def test_send(self):
events = []

Expand Down

0 comments on commit b957951

Please sign in to comment.