Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge benallard/buildbot:patch-1 (PR #1277)
  • Loading branch information
djmitche committed Oct 23, 2014
2 parents 130751b + 179d7a8 commit c6e4cc5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion master/buildbot/schedulers/forcesched.py
Expand Up @@ -636,7 +636,9 @@ def __init__(self, name, builderNames,
if codebases is None:
codebases = [CodebaseParameter(codebase='')]
elif not codebases:
config.error("ForceScheduler: 'codebases' cannot be empty; use CodebaseParameter(codebase='', hide=True) if needed: %r " % (codebases,))
config.error("ForceScheduler: 'codebases' cannot be empty; use [CodebaseParameter(codebase='', hide=True)] if needed: %r " % (codebases,))
elif not isinstance(codebases, list):
config.error("ForceScheduler: 'codebases' should be a list of strings or CodebaseParameter, not %s" % type(codebases))

codebase_dict = {}
for codebase in codebases:
Expand Down
2 changes: 1 addition & 1 deletion master/buildbot/test/unit/test_schedulers_forcesched.py
Expand Up @@ -250,7 +250,7 @@ def test_bad_codebases(self):
codebases=[IntParameter('foo')],))

# codebases cannot be empty
self.assertRaisesConfigError("ForceScheduler: 'codebases' cannot be empty; use CodebaseParameter(codebase='', hide=True) if needed:",
self.assertRaisesConfigError("ForceScheduler: 'codebases' cannot be empty; use [CodebaseParameter(codebase='', hide=True)] if needed:",
lambda: ForceScheduler(name='foo',
builderNames=['bar'],
codebases=[]))
Expand Down

0 comments on commit c6e4cc5

Please sign in to comment.