Kouhei Sutou 2019-03-26 16:48:47 +0900 (Tue, 26 Mar 2019) Revision: ad4a94fa0f6b6bfc486fe35d950b3882470a0078 https://github.com/groonga/groonga-query-log/commit/ad4a94fa0f6b6bfc486fe35d950b3882470a0078 Message: Fix a bug that failure subject is always used Modified files: lib/groonga-query-log/command/run-regression-test.rb Modified: lib/groonga-query-log/command/run-regression-test.rb (+15 -16) =================================================================== --- lib/groonga-query-log/command/run-regression-test.rb 2019-03-26 16:11:10 +0900 (476ee69) +++ lib/groonga-query-log/command/run-regression-test.rb 2019-03-26 16:48:47 +0900 (3440e31) @@ -660,20 +660,22 @@ module GroongaQueryLog @path = @options[:path] || "results" end - def notify(output=nil) + def notify return unless @options[:mail_to] - format_log = "" - @output = output || StringIO.new - formetter = FormatRegressionTestLogs.new(output: @output) + output = StringIO.new + formetter = FormatRegressionTestLogs.new(output: output) formetter.run([@path]) - format_log =****@outpu***** + formatted_log = output.string - subject = @options[:mail_subject_on_success] + if @success + subject = @options[:mail_subject_on_success] + else + subject = @options[:mail_subject_on_failure] + end content = format_elapsed_time - subject = @options[:mail_subject_on_failure] - content << "Report:" - content << format_log + content << "Report:\n" + content << formatted_log send_mail(subject, content) end @@ -693,24 +695,21 @@ module GroongaQueryLog def send_mail(subject, content) header = <<-HEADER -X-Mailer: groonga-query-log test reporter MIME-Version: 1.0 +X-Mailer: groonga-query-log test reporter #{VERSION}; + https://github.com/groonga/groonga-query-log Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: base64 +Content-Transfer-Encoding: 8bit From: #{@options[:mail_from]} To: #{@options[:mail_to]} Subject: #{subject} Date: #{Time.now.rfc2822} HEADER - body = Base64.encode64(content) - mail = <<-MAIL.gsub(/\r?\n/, "\r\n") #{header} - -#{body} +#{content} MAIL - return if @options[:skip_smtp] smtp = Net::SMTP.new(@options[:smtp_server], @options[:smtp_port]) smtp.enable_starttls if @options[:smtp_starttls] smtp.start(@options[:smtp_server], -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20190326/fa6a31b6/attachment-0001.html>
