grntest 1.4.1 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e90468027680b461a1633c49db9f3feb7babd1a0c2e81a4aad381ade35b4fb3
-  data.tar.gz: 31b1cc050ea4b70ed08082a0b5443586676aa5d77c0512287736ee1837b4c371
+  metadata.gz: 88fbad2fdde680dc3110737087f9818240bd130ea4c61c14478d89577dd99420
+  data.tar.gz: e98f331062e055f4fd914ef1916dc4859614e1ef0c9f3a16c978d00d73d05a23
 SHA512:
-  metadata.gz: f8067b106d13ebd121cd96d43eb82b807adb81fe89ea26df1ea4eeb8dfdd6be096e14fdbeeb6ca00528d5704d0d53d6123e28d45973fb5bb283990c59101e090
-  data.tar.gz: b8eb794be911a7dc8b7eb74172b4cb109cafe74a945cfc3ca3e626d90a54a36ca61058c91883238b579d4c0a92578a58d46b2aff4a7dbb1c4086059a0109245e
+  metadata.gz: 4e51b3927eb61e1232ade4c179a140eddd68d41d5231f4bee0e7b356cce389d8b72c110f5217418d9e214fa071486bd3ffe55e61e2e9def19b90b425e193e2ca
+  data.tar.gz: bd7a5ad8f297572b51f797f359ae2c42d9a01a013d6c48c6d3e168d648bf32af405ec0f8af36f1e0fef84a86756ccb2b918988a35696ed3af505e50dd23350bc

data/doc/text/news.md

@@ -1,5 +1,40 @@
 # News
 
+## 1.4.6: 2020-12-08
+
+### Improvements
+
+  * Added `require-feature` directive.
+
+## 1.4.5: 2020-11-11
+
+### Improvements
+
+  * Added `sleep-after-command` directive.
+
+## 1.4.4: 2020-07-18
+
+### Improvements
+
+  * Added support for detecting backtrace log for MinGW build.
+
+## 1.4.3: 2020-05-31
+
+### Improvements
+
+  * Removed log normalization.
+
+## 1.4.2: 2020-05-30
+
+### Improvements
+
+  * Removed log level normalization.
+
+  * Added `require-platform` directive.
+
+  * Added support for normalizing IO open/close log message with
+    additional message.
+
 ## 1.4.1: 2020-05-30
 
 ### Improvements

data/lib/grntest/execution-context.rb

@@ -37,6 +37,7 @@ module Grntest
     attr_writer :suppress_backtrace
     attr_writer :collect_query_log
     attr_writer :debug
+    attr_accessor :platform
     def initialize
       @logging = true
       @base_directory = Pathname(".")
@@ -66,6 +67,7 @@ module Grntest
       @suppress_backtrace = true
       @collect_query_log = false
       @debug = false
+      @platform = guess_platform
     end
 
     def logging?
@@ -173,5 +175,18 @@ module Grntest
         "so"
       end
     end
+
+    def guess_platform
+      case RUBY_PLATFORM
+      when /mingw|mswin/
+        "windows"
+      when /darwin/
+        "macos"
+      when /linux/
+        "linux"
+      else
+        "unknown"
+      end
+    end
   end
 end

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

@@ -44,6 +44,9 @@ module Grntest
         @context = context
         @custom_important_log_levels = []
         @ignore_log_patterns = {}
+        @sleep_after_command = nil
+        @status_response = nil
+        @features = nil
       end
 
       def execute(script_path)
@@ -321,28 +324,28 @@ module Grntest
         parser << "#{expand_variables(groonga_command)}\n"
       end
 
-      def execute_directive_require_input_type(parser, line, content, options)
+      def execute_directive_require_input_type(line, content, options)
         input_type, = options
         unless @context.input_type == input_type
           omit("require input type: #{input_type}")
         end
       end
 
-      def execute_directive_require_testee(parser, line, content, options)
+      def execute_directive_require_testee(line, content, options)
         testee, = options
         unless @context.testee == testee
           omit("require testee: #{testee}")
         end
       end
 
-      def execute_directive_require_interface(parser, line, content, options)
+      def execute_directive_require_interface(line, content, options)
         interface, = options
         unless @context.interface == interface
           omit("require interface: #{interface}")
         end
       end
 
-      def execute_directive_require_apache_arrow(parser, line, content, options)
+      def execute_directive_require_apache_arrow(line, content, options)
         unless defined?(::Arrow)
           omit("require Apache Arrow")
         end
@@ -364,16 +367,65 @@ module Grntest
         end
       end
 
-      def execute_directive_add_ignore_log_pattern(parser, line, content, options)
+      def execute_directive_add_ignore_log_pattern(line, content, options)
         pattern = content.split(" ", 2)[1]
         @ignore_log_patterns[pattern] = compile_pattern(pattern)
       end
 
-      def execute_directive_remove_ignore_log_pattern(parser, line, content, options)
+      def execute_directive_remove_ignore_log_pattern(line, content, options)
         pattern = content.split(" ", 2)[1]
         @ignore_log_patterns.delete(pattern)
       end
 
+      def execute_directive_require_platform(line, content, options)
+        platform, = options
+        if platform.start_with?("!")
+          if @context.platform == platform[1..-1]
+            omit("require platform: #{platform} (#{@context.platform})")
+          end
+        else
+          if @context.platform != platform
+            omit("require platform: #{platform} (#{@context.platform})")
+          end
+        end
+      end
+
+      def execute_directive_sleep_after_command(line, content, options)
+        if options[0]
+          time = options[0].to_f
+        else
+          time = nil
+        end
+        @sleep_after_command = time
+      end
+
+      def features
+        return @features if @features
+        @features = []
+        JSON.parse(@status_response)[1]["features"].each do |name, available|
+          @features << name if available
+        end
+        @features.sort!
+        @features
+      end
+
+      def formatted_features
+        features.join(", ")
+      end
+
+      def execute_directive_require_feature(line, content, options)
+        feature, = options
+        if feature.start_with?("!")
+          if features.include?(feature[1..-1])
+            omit("require feature: #{feature} (#{formatted_features})")
+          end
+        else
+          unless features.include?(feature)
+            omit("require feature: #{feature} (#{formatted_features})")
+          end
+        end
+      end
+
       def execute_directive(parser, line, content)
         command, *options = Shellwords.split(content)
         case command
@@ -410,17 +462,23 @@ module Grntest
         when "eval"
           execute_directive_eval(parser, line, content, options)
         when "require-input-type"
-          execute_directive_require_input_type(parser, line, content, options)
+          execute_directive_require_input_type(line, content, options)
         when "require-testee"
-          execute_directive_require_testee(parser, line, content, options)
+          execute_directive_require_testee(line, content, options)
         when "require-interface"
-          execute_directive_require_interface(parser, line, content, options)
+          execute_directive_require_interface(line, content, options)
         when "require-apache-arrow"
-          execute_directive_require_apache_arrow(parser, line, content, options)
+          execute_directive_require_apache_arrow(line, content, options)
         when "add-ignore-log-pattern"
-          execute_directive_add_ignore_log_pattern(parser, line, content, options)
+          execute_directive_add_ignore_log_pattern(line, content, options)
         when "remove-ignore-log-pattern"
-          execute_directive_remove_ignore_log_pattern(parser, line, content, options)
+          execute_directive_remove_ignore_log_pattern(line, content, options)
+        when "require-platform"
+          execute_directive_require_platform(line, content, options)
+        when "sleep-after-command"
+          execute_directive_sleep_after_command(line, content, options)
+        when "require-feature"
+          execute_directive_require_feature(line, content, options)
         else
           log_input(line)
           log_error("#|e| unknown directive: <#{command}>")
@@ -486,6 +544,7 @@ module Grntest
         else
           type = @output_type
           log_output(response)
+          sleep(@sleep_after_command) if @sleep_after_command
           log_error(extract_important_messages(read_all_log))
           log_query_log_content(read_all_query_log)
 
@@ -535,32 +594,14 @@ module Grntest
           end
           next if thread_log_message?(entry.message)
           next if ignore_log_message?(entry.message)
-          log_level, message = normalize_log(entry)
+          log_level = entry.log_level
           formatted_log_level = format_log_level(log_level)
+          message = entry.message
           important_messages << "\#|#{formatted_log_level}| #{message}"
         end
         important_messages.join("\n")
       end
 
-      def normalize_log(entry)
-        case entry.message
-        when /\A(\[io\]\[(?:open|close)\]) <(.*?)>\z/
-          tag = $1
-          path = $2
-          normalized_path = File.basename(path)
-          normalized_message = "#{tag} <#{normalized_path}>"
-          case entry.log_level
-          when :info, :debug
-            normalized_log_level = :debug
-          else
-            normalized_log_level = entry.log_level
-          end
-          [normalized_log_level, normalized_message]
-        else
-          [entry.log_level, entry.message]
-        end
-      end
-
       def read_all_readable_content(output, options={})
         content = ""
         first_timeout = options[:first_timeout] || @context.read_timeout
@@ -624,6 +665,8 @@ module Grntest
           true
         when /\A\(unknown\):\d+:\d+: /
           true
+        when /\A[\w.\\-]+:\d+:\d+: /
+          true
         when /\A(?:groonga|groonga-httpd)
                 \((?:\+0x\h+|\w+\+0x\h+)?\)
                 \s

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

@@ -61,7 +61,7 @@ module Grntest
       def ensure_groonga_ready
         n_retried = 0
         begin
-          send_command(command("status"))
+          @status_response = send_command(command("status"))
         rescue Error
           n_retried += 1
           sleep(0.1)

data/lib/grntest/executors/standard-io-executor.rb

@@ -44,7 +44,7 @@ module Grntest
       def ensure_groonga_ready
         @input.print("status\n")
         @input.flush
-        @output.gets
+        @status_response = @output.gets
       end
 
       def create_sub_executor(context)

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.4.1"
+  VERSION = "1.4.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.6
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-30 00:00:00.000000000 Z
+date: 2020-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.pre1
+rubygems_version: 3.2.0.rc.2
 signing_key: 
 specification_version: 4
 summary: Grntest is a testing framework for Groonga. You can write a test for Groonga