Skip to content

Commit

Permalink
clarify log messages
Browse files Browse the repository at this point in the history
  • Loading branch information
djmitche committed Jan 21, 2014
1 parent b7f6032 commit 34a9530
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions master/buildbot/process/buildstep.py
Expand Up @@ -729,7 +729,7 @@ def __init__(self, logfiles=None, lazylogfiles=None, log_eval_func=None,

if any([x is not None for x in [logfiles, lazylogfiles, log_eval_func]]):
config.error(
"'logfiles', 'lazylogfiles', 'log_eval_func' paramaters are no longer available")
"The LoggingBuildStep parameters 'logfiles', 'lazylogfiles' and 'log_eval_func' are no longer available")
self.addLogObserver('stdio', OutputProgressObserver("output"))

def addLogFile(self, logname, filename):
Expand All @@ -743,7 +743,7 @@ def setupLogsRunCommandAndProcessResults(self, cmd, stdioLog=None, closeLogWhenF
logfiles = {}
if logfiles:
cmd.setLogFiles(logfiles)
log.msg("%s.startCommandWithoutEnding(cmd=%s)" % (self.__class__.__name__, cmd))
log.msg("%s.setupLogsRunCommandAndProcessResults(cmd=%s)" % (self.__class__.__name__, cmd))
log.msg(" cmd.args = %r" % (cmd.args,))
self.cmd = cmd # so we can interrupt it
# TODO: when the status.LogFile object no longer exists, then this
Expand Down
5 changes: 3 additions & 2 deletions master/buildbot/test/unit/test_process_buildstep.py
Expand Up @@ -326,8 +326,9 @@ def test_isNewStyle(self):


class TestLoggingBuildStep(config.ConfigErrorsMixin, unittest.TestCase):
deprecatedMsg = ("'logfiles', 'lazylogfiles', 'log_eval_func' paramaters "
"are no longer available")
deprecatedMsg = ("The LoggingBuildStep parameters 'logfiles', "
"'lazylogfiles' and 'log_eval_func' are no longer "
"available")

def makeRemoteCommand(self, rc, stdout, stderr=''):
cmd = fakeremotecommand.FakeRemoteCommand('cmd', {})
Expand Down

0 comments on commit 34a9530

Please sign in to comment.