Skip to content

Commit

Permalink
minor tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
djmitche committed Jul 7, 2013
1 parent 29c13a7 commit 1896a87
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions master/buildbot/test/fake/fakedb.py
Expand Up @@ -1238,7 +1238,7 @@ def getBuildslaves(self, masterid=None, builderid=None):
pairs = [ builder_masters[cfg['buildermasterid']]
for cfg in configured ]
if builderid is not None and masterid is not None:
if(builderid, masterid) not in pairs:
if (builderid, masterid) not in pairs:
continue
if builderid is not None:
if not any(builderid == p[0] for p in pairs):
Expand All @@ -1262,7 +1262,7 @@ def updateBuildslave(self, buildslaveid, slaveinfo):
slave['info'] = slaveinfo
return defer.succeed(None)

def _configedOn(self, buildslaveid, builderid=None, masterid=None):
def _configuredOn(self, buildslaveid, builderid=None, masterid=None):
cfg = []
for cs in self.configured.itervalues():
if cs['buildslaveid'] != buildslaveid:
Expand Down Expand Up @@ -1290,7 +1290,7 @@ def _mkdict(self, sl, builderid, masterid):
'id': sl['id'],
'slaveinfo': sl['info'],
'name': sl['name'],
'configured_on': self._configedOn(sl['id'], builderid, masterid),
'configured_on': self._configuredOn(sl['id'], builderid, masterid),
'connected_to': self._connectedTo(sl['id'], masterid),
}

Expand Down

0 comments on commit 1896a87

Please sign in to comment.