grntest 1.5.7 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29784781308745fb8cbb626e33012d1dfb25dfdbe7196c53079b57327478a4d2
-  data.tar.gz: 970b7ea3558d9ad1febbdfa4b375f849b0dd10bb81c65b6651b6e210a91e6431
+  metadata.gz: 2209e3afe2a2ef0d25a9ad8e61e0ef36fad7b9faa7106b20d00511ad6f767a9e
+  data.tar.gz: dfe1b6a22dbae8d02ada396dc237e20f7384e94a52b5c37e35d8c2dbd01a90df
 SHA512:
-  metadata.gz: 9752d6bcb935119c458d2911a7643620a6b3c5b4b9a2a8af772a5d8942e3a94fef6a51370772a317bbeaa47b202e35b3e47a5ed66e6b33c0e9870249e4ac3d8d
-  data.tar.gz: 35d70626990bead81c6eccb5a15b21c4a00279484635f131d231e0d5f2242cf48ac220a4d72e9d61addce35d0e07c20073a2a0e3f6df08cdc48adfce351863f2
+  metadata.gz: 9e84e6673963cb2bf2de0cb5cbd21a9d64977924716c37102aea48415aab1ffcbfdde2f630030f3179828c9e0855da124ca226523c0a060dd92cfd04bb6880e1
+  data.tar.gz: 6f2c4f6730b26200e5fa8d39cb56d550dbe98407e5eb54f824e99f0dac9a84616da12fb1f4a32e799344d443d91fd297128e979a8c1caafa96d85a15fb7444ce

data/doc/text/news.md

@@ -1,5 +1,15 @@
 # News
 
+## 1.5.8: 2023-07-21
+
+### Improvements
+
+  * `--random-seed`: Added.
+
+  * xml: Accepted negative elapsed time.
+
+  * Added support for groonga-nginx.
+
 ## 1.5.7: 2023-03-08
 
 ### Improvements

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

@@ -767,7 +767,7 @@ module Grntest
           true
         when /\A[\w.\\-]+:\d+:\d+: /
           true
-        when /\A(?:groonga|groonga-httpd)
+        when /\A(?:groonga|groonga-httpd|nginx)
                 \((?:\+0x\h+|\w+\+0x\h+)?\)
                 \s
                 \[0x\h+\]\z/x

data/lib/grntest/test-runner.rb

@@ -500,10 +500,13 @@ call (int)chdir("#{context.temporary_directory_path}")
           "-s",
           context.relative_db_path.to_s,
         ]
-      when "groonga-httpd"
-        command_line = command_command_line(@tester.groonga_httpd, context,
+      when "groonga-httpd", "groonga-nginx"
+        command_line = command_command_line(@tester.groonga_httpd,
+                                            context,
                                             spawn_options)
-        config_file_path = create_config_file(context, host, port,
+        config_file_path = create_config_file(context,
+                                              host,
+                                              port,
                                               pid_file_path)
         command_line += [
           "-c", config_file_path.to_s,
@@ -517,6 +520,11 @@ call (int)chdir("#{context.temporary_directory_path}")
       config_file_path =
         context.temporary_directory_path + "groonga-httpd.conf"
       config_file_path.open("w") do |config_file|
+        if @tester.ngx_http_groonga_module_so
+          config_file.puts(<<-LOAD_MODULE)
+load_module #{@tester.ngx_http_groonga_module_so};
+          LOAD_MODULE
+        end
         config_file.puts(<<-GLOBAL)
 daemon off;
 master_process off;
@@ -725,7 +733,7 @@ http {
 
     def normalize_output_xml(content, options)
       content.sub(/^<RESULT .+?>/) do |result|
-        result.gsub(/( (?:UP|ELAPSED))="\d+\.\d+(?:e[+-]?\d+)?"/, '\1="0.0"')
+        result.gsub(/( (?:UP|ELAPSED))="-?\d+\.\d+(?:e[+-]?\d+)?"/, '\1="0.0"')
       end
     end
 

data/lib/grntest/tester.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2023  Sutou Kouhei <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
@@ -38,6 +38,7 @@ module Grntest
         parser = OptionParser.new
         parser.banner += " TEST_FILE_OR_DIRECTORY..."
 
+        custom_groonga_httpd = false
         parser.on("--groonga=COMMAND",
                   "Use COMMAND as groonga command",
                   "(#{tester.groonga})") do |command|
@@ -48,6 +49,13 @@ module Grntest
                   "Use COMMAND as groonga-httpd command for groonga-httpd tests",
                   "(#{tester.groonga_httpd})") do |command|
           tester.groonga_httpd = normalize_command(command)
+          custom_groonga_httpd = true
+        end
+
+        parser.on("--ngx-http-groonga-module-so=PATH",
+                  "Use PATH as ngx_http_groonga_module.so for groonga-nginx tests",
+                  "(#{tester.ngx_http_groonga_module_so})") do |path|
+          tester.ngx_http_groonga_module_so = path
         end
 
         parser.on("--groonga-suggest-create-dataset=COMMAND",
@@ -101,15 +109,19 @@ module Grntest
           tester.output_type = type
         end
 
-        available_testees = ["groonga", "groonga-httpd"]
+        available_testees = ["groonga", "groonga-httpd", "groonga-nginx"]
         available_testee_labels = available_testees.join(", ")
         parser.on("--testee=TESTEE", available_testees,
                   "Test against TESTEE",
                   "[#{available_testee_labels}]",
                   "(#{tester.testee})") do |testee|
           tester.testee = testee
-          if tester.testee == "groonga-httpd"
+          case tester.testee
+          when "groonga-httpd"
+            tester.interface = "http"
+          when "groonga-nginx"
             tester.interface = "http"
+            tester.groonga_httpd = "nginx" unless custom_groonga_httpd
           end
         end
 
@@ -281,6 +293,11 @@ module Grntest
           tester.shutdown_wait_timeout = timeout
         end
 
+        parser.on("--random-seed=SEED", Integer,
+                  "Seed for random numbers") do |seed|
+          srand(seed)
+        end
+
         parser.on("--version",
                   "Show version and exit") do
           puts(VERSION)
@@ -317,6 +334,7 @@ module Grntest
 
     attr_accessor :groonga
     attr_accessor :groonga_httpd
+    attr_accessor :ngx_http_groonga_module_so
     attr_accessor :groonga_suggest_create_dataset
     attr_accessor :groonga_synonym_generate
     attr_accessor :interface
@@ -346,6 +364,7 @@ module Grntest
     def initialize
       @groonga = "groonga"
       @groonga_httpd = "groonga-httpd"
+      @ngx_http_groonga_module_so = nil
       @groonga_suggest_create_dataset = "groonga-suggest-create-dataset"
       unless command_exist?(@groonga_suggest_create_dataset)
         @groonga_suggest_create_dataset = nil

data/lib/grntest/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2023  Sutou Kouhei <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
@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Grntest
-  VERSION = "1.5.7"
+  VERSION = "1.5.8"
 end

data/lib/grntest/worker.rb

@@ -93,31 +93,29 @@ module Grntest
 
       @result.measure do
         @reporter.on_worker_start(self)
-        catch do |tag|
-          loop do
-            suite_name, test_script_path, test_name = queue.pop
-            break if test_script_path.nil?
-
-            unless @suite_name == suite_name
-              @reporter.on_suite_finish(self) if @suite_name
-              @suite_name = suite_name
-              @reporter.on_suite_start(self)
-            end
-
-            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
+        loop do
+          suite_name, test_script_path, test_name = queue.pop
+          break if test_script_path.nil?
+
+          unless @suite_name == suite_name
+            @reporter.on_suite_finish(self) if @suite_name
+            @suite_name = suite_name
+            @reporter.on_suite_start(self)
+          end
+
+          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
-          @status = "finished"
-          @reporter.on_suite_finish(@suite_name) if @suite_name
-          @suite_name = nil
         end
+        @status = "finished"
+        @reporter.on_suite_finish(@suite_name) if @suite_name
+        @suite_name = nil
       end
       @reporter.on_worker_finish(self)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs