diff options
| author | Jack Nagel | 2014-12-02 21:14:53 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-12-02 21:14:53 -0500 |
| commit | b9474dfc4283f3e3f649183b6ad90f2977074fc5 (patch) | |
| tree | 352aeff3c851e096146fe95bddf8f775fe4a3b8c /Library/Homebrew | |
| parent | a463caae360022a8ef5a4320707d5c8dc5c02c68 (diff) | |
| download | brew-b9474dfc4283f3e3f649183b6ad90f2977074fc5.tar.bz2 | |
Simplify appending CDATA
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cmd/test-bot.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index ec4fececf..299d15774 100644 --- a/Library/Homebrew/cmd/test-bot.rb +++ b/Library/Homebrew/cmd/test-bot.rb @@ -691,24 +691,24 @@ module Homebrew testcase.attributes['time'] = step.time if step.has_output? - output = step.output - # Remove invalid XML CData characters from step output. - output = output.delete("\000\a\b\e\f") + output = step.output.delete("\000\a\b\e\f") if output.bytesize > BYTES_IN_1_MEGABYTE output = "truncated output to 1MB:\n" \ + output.slice(-BYTES_IN_1_MEGABYTE, BYTES_IN_1_MEGABYTE) end - output = REXML::CData.new output + + cdata = REXML::CData.new output + if step.passed? - system_out = testcase.add_element 'system-out' - system_out.text = output + elem = testcase.add_element "system-out" else - failure = testcase.add_element 'failure' - failure.attributes["message"] = "#{step.status}: #{step.command.join(" ")}" - failure.text = output + elem = testcase.add_element "failure" + elem.add_attribute "message", "#{step.status}: #{step.command.join(" ")}" end + + elem << cdata end end end |
