grntest 1.2.9 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 918e4ad9c8dff964b3ed84306ab5b8c732f7e955
-  data.tar.gz: badb1c9d6184a8b06bdcf5a31ea0b3a522af6d8b
+  metadata.gz: c55e0bf4a89cc29c33e5081c6380c2652844e33a
+  data.tar.gz: 0d469e06c4bdb6b18761d40342d0d6d436f4d6fb
 SHA512:
-  metadata.gz: 5efc50e1de933eaa6f5ca269557671aeb74b53c3cad944a658da036bb2efb8228c8b43e768945a8fbc01595d881271de627980876943cd6fb1a6534624a061b2
-  data.tar.gz: 5a77064a41d9990c0acfe3bb89e90a000989fd9765411713a4efa9b2eb2066dc9fd7fa39080490ea771c4a313e6ad09d2e32ad6243c8fb93bda402f1349a37f5
+  metadata.gz: 95563f90d0b1d93ec3568d5996a4c43a9d3617db4ead96f843b2b13f1009702c974511caee8d1638a26b90cd1fb3dc51625e39c97903d4e7120983bc8fc13f2f
+  data.tar.gz: aee7784eac1c012ee42ea39faba590f74044abbee1dee52ecf21d42008bdc38f3d698ce56eeb144d80ffebb7b62680f8288c2a4365277456483a434be2bf8458

data/doc/text/news.md

@@ -1,5 +1,17 @@
 # News
 
+## 1.3.0: 2018-11-16
+
+### Improvements
+
+  * Improved to force logging backtrace on crash.
+
+  * Added `--n-retries` option.
+
+### Fixes
+
+* Fixed encoding error on error report.
+
 ## 1.2.9: 2018-01-18
 
 ### Improvements

data/lib/grntest/executors/base-executor.rb

@@ -58,11 +58,11 @@ module Grntest
                 parser << line
               rescue Error, Groonga::Command::Parser::Error
                 line_info = "#{script_path}:#{script_file.lineno}:#{line.chomp}"
-                log_error("#{line_info}: #{$!.message}")
+                log_error("#{line_info}: #{$!.message.b}")
                 if $!.is_a?(Groonga::Command::Parser::Error)
                   @context.abort
                 else
-                  log_error("#{line_info}: #{$!.message}")
+                  log_error("#{line_info}: #{$!.message.b}")
                   raise unless @context.top_level?
                 end
               end
@@ -426,10 +426,20 @@ module Grntest
       def extract_important_messages(log)
         important_messages = []
         parser = LogParser.new
+        in_crash = false
         parser.parse(log) do |entry|
+          if entry.log_level == "C"
+            case entry.message
+            when "-- CRASHED!!! --"
+              in_crash = true
+            when "----------------"
+              in_crash = false
+            end
+          end
+
           next unless important_log_level?(entry.log_level)
           if @context.suppress_backtrace?
-            next if backtrace_log_message?(entry.message)
+            next if !in_crash and backtrace_log_message?(entry.message)
           end
           next if thread_log_message?(entry.message)
           important_messages << "\#|#{entry.log_level}| #{entry.message}"

data/lib/grntest/tester.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2018  Kouhei Sutou <kou@clear-code.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -230,6 +230,12 @@ module Grntest
           tester.debug = debug
         end
 
+        parser.on("--n-retries=N", Integer,
+                  "Retry N times on failure",
+                  "(#{tester.n_retries})") do |n|
+          tester.n_retries = n
+        end
+
         parser.on("--version",
                   "Show version and exit") do
           puts(VERSION)
@@ -281,6 +287,7 @@ module Grntest
     attr_writer :debug
     attr_reader :test_patterns, :test_suite_patterns
     attr_reader :exclude_test_patterns, :exclude_test_suite_patterns
+    attr_accessor :n_retries
     def initialize
       @groonga = "groonga"
       @groonga_httpd = "groonga-httpd"
@@ -311,6 +318,7 @@ module Grntest
       initialize_memory_checkers
       @timeout = 5
       @read_timeout = 3
+      @n_retries = 0
     end
 
     def run(*targets)

data/lib/grntest/version.rb

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Grntest
-  VERSION = "1.2.9"
+  VERSION = "1.3.0"
 end

data/lib/grntest/worker.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2018  Kouhei Sutou <kou@clear-code.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -99,12 +99,13 @@ module Grntest
               @suite_name = suite_name
               @reporter.on_suite_start(self)
             end
-            @test_script_path = test_script_path
-            @test_name = test_name
-            runner = TestRunner.new(@tester, self)
-            succeeded = false unless runner.run
+
+            unless run_test(test_script_path, test_name)
+              succeeded = false
+            end
 
             break if interruptted?
+
             if @tester.stop_on_failure? and @test_suites_result.have_failure?
               break
             end
@@ -162,8 +163,32 @@ module Grntest
     def on_test_finish(result)
       @result.on_test_finish
       @reporter.on_test_finish(self, result)
-      @test_script_path = nil
-      @test_name = nil
+    end
+
+    private
+    def run_test(test_script_path, test_name)
+      begin
+        @test_script_path = test_script_path
+        @test_name = test_name
+
+        n = -1
+        loop do
+          n += 1
+
+          runner = TestRunner.new(@tester, self)
+          return true if runner.run
+
+          if n < @tester.n_retries and not interruptted?
+            @test_suites_result.n_total_tests += 1
+            next
+          end
+
+          return false
+        end
+      ensure
+        @test_script_path = nil
+        @test_name = nil
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.3.0
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -219,13 +219,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Grntest is a testing framework for Groonga. You can write a test for Groonga
   by writing Groonga commands and expected result.
 test_files:
-- test/run-test.rb
 - test/executors/test-base-executor.rb
 - test/executors/test-standard-io-executor.rb
+- test/run-test.rb
 - test/test-log-parser.rb