Skip to content

Commit

Permalink
run unit tests before commit. correct unit test errors.
Browse files Browse the repository at this point in the history
  • Loading branch information
byilmazturk committed Jul 28, 2015
1 parent 1520524 commit b9e079a
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions master/buildbot/config.py
Expand Up @@ -24,6 +24,7 @@
from buildbot.util import config as util_config
from buildbot.util import safeTranslate
from buildbot.util import service as util_service
from buildbot.util import identifiers as util_identifiers
from buildbot.www import auth
from buildbot.www import avatar
from twisted.python import failure
Expand Down Expand Up @@ -538,20 +539,25 @@ def load_slaves(self, filename, config_dict):
error(msg)
return

# if sl.slavename in ("debug", "change", "status"):
# msg = "slave name '%s' is reserved" % sl.slavename
# error(msg)

#if not util.identifiers.isIdentifier(50, sl.slavename):
def validate(slavename):
if sl.slavename in ("debug", "change", "status"):
yield "slave name %r - is reserved" % slavename
if slavename in ("debug", "change", "status"):
yield "slave name '%s' is reserved" % slavename
if not isinstance(slavename, unicode):
yield "slave name %r - is not a unicode string" % slavename
if not util.identifiers.ident_re.match(slavename):
if not util_identifiers.ident_re.match(slavename):
yield "slave name %r - is not an identifier" % slavename
if len(slavename) < 1:
yield "slave name %r - identifiers cannot be an empty string" % slavename
if len(slavename) > 50:
yield "slave name %r - is longer than %d characters" % (slavename, 50)

for msg in validate(sl.slavename):
error(msg)
for msg in validate(sl.slavename):
error(msg)

self.slaves = config_dict['slaves']

Expand Down

0 comments on commit b9e079a

Please sign in to comment.