OLD | NEW |
1 # -*- test-case-name: buildbot.test.test_steps -*- | 1 # -*- test-case-name: buildbot.test.test_steps -*- |
2 | 2 |
3 from zope.interface import implements | 3 from zope.interface import implements |
4 from twisted.internet import reactor, defer, error | 4 from twisted.internet import reactor, defer, error |
5 from twisted.protocols import basic | 5 from twisted.protocols import basic |
6 from twisted.spread import pb | 6 from twisted.spread import pb |
7 from twisted.python import log | 7 from twisted.python import log |
8 from twisted.python.failure import Failure | 8 from twisted.python.failure import Failure |
9 from twisted.web.util import formatFailure | 9 from twisted.web.util import formatFailure |
10 | 10 |
(...skipping 990 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1001 startCommand(). | 1001 startCommand(). |
1002 """ | 1002 """ |
1003 self.logfiles[logname] = filename | 1003 self.logfiles[logname] = filename |
1004 | 1004 |
1005 def startCommand(self, cmd, errorMessages=[]): | 1005 def startCommand(self, cmd, errorMessages=[]): |
1006 """ | 1006 """ |
1007 @param cmd: a suitable RemoteCommand which will be launched, with | 1007 @param cmd: a suitable RemoteCommand which will be launched, with |
1008 all output being put into our self.stdio_log LogFile | 1008 all output being put into our self.stdio_log LogFile |
1009 """ | 1009 """ |
1010 log.msg("ShellCommand.startCommand(cmd=%s)" % (cmd,)) | 1010 log.msg("ShellCommand.startCommand(cmd=%s)" % (cmd,)) |
1011 log.msg(" cmd.args = %r" % (cmd.args)) | 1011 args = cmd.args |
| 1012 if "patch" in cmd.args: |
| 1013 # Don't print the patch in the logs, it's often too large and not |
| 1014 # useful. |
| 1015 args = cmd.args.copy() |
| 1016 # This is usually a tuple so convert it to a list to be able to modify |
| 1017 # it. |
| 1018 patch = list(args['patch'][:]) |
| 1019 patch[1] = "(%s bytes)" % len(patch[1]) |
| 1020 args['patch'] = patch |
| 1021 log.msg(" cmd.args = %r" % (args)) |
1012 self.cmd = cmd # so we can interrupt it | 1022 self.cmd = cmd # so we can interrupt it |
1013 self.step_status.setText(self.describe(False)) | 1023 self.step_status.setText(self.describe(False)) |
1014 | 1024 |
1015 # stdio is the first log | 1025 # stdio is the first log |
1016 self.stdio_log = stdio_log = self.addLog("stdio") | 1026 self.stdio_log = stdio_log = self.addLog("stdio") |
1017 cmd.useLog(stdio_log, True) | 1027 cmd.useLog(stdio_log, True) |
1018 for em in errorMessages: | 1028 for em in errorMessages: |
1019 stdio_log.addHeader(em) | 1029 stdio_log.addHeader(em) |
1020 # TODO: consider setting up self.stdio_log earlier, and have the | 1030 # TODO: consider setting up self.stdio_log earlier, and have the |
1021 # code that passes in errorMessages instead call | 1031 # code that passes in errorMessages instead call |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1152 # this is good enough for most steps, but it can be overridden to | 1162 # this is good enough for most steps, but it can be overridden to |
1153 # get more control over the displayed text | 1163 # get more control over the displayed text |
1154 self.step_status.setText(self.getText(cmd, results)) | 1164 self.step_status.setText(self.getText(cmd, results)) |
1155 self.step_status.setText2(self.maybeGetText2(cmd, results)) | 1165 self.step_status.setText2(self.maybeGetText2(cmd, results)) |
1156 | 1166 |
1157 # (WithProperties used to be available in this module) | 1167 # (WithProperties used to be available in this module) |
1158 from buildbot.process.properties import WithProperties | 1168 from buildbot.process.properties import WithProperties |
1159 _hush_pyflakes = [WithProperties] | 1169 _hush_pyflakes = [WithProperties] |
1160 del _hush_pyflakes | 1170 del _hush_pyflakes |
1161 | 1171 |
OLD | NEW |