grntest 1.4.0 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74d1dc6f79ac8d329d3617251cc20205a8b39dbfff7859923908f7e5bd28297b
-  data.tar.gz: 9b98ceee1753fc34a3f3bb557e414f8061232e18cf707c35a0b35e16ef624fab
+  metadata.gz: 3903fe505e64094eb8951ddcca8e346e328da5a71c11eb2b9d30cca76618377a
+  data.tar.gz: f3dd540ee69267c74c6af70275f5a9630b9454bae75dce1ab6b8bf335efd80eb
 SHA512:
-  metadata.gz: 9caea14cdead4169fcc5b0d5de94365d7a0f008c3e991112f4d729c4f305159801cec6eac306dcf2e0bfb7753dca8b85bb228e15249a78f56176b2addccdd9ee
-  data.tar.gz: 9c41048f1554a23aabc0896e65c1ff04e84bf5a44870d56ae03130e5821845edb0ab13bdabf724d216f216eb792482491e334acb8b06c0232bd8ff5400d72c64
+  metadata.gz: bec42dc8095c0f04ad0b3fb9c269e021b9986cf9a9cb606c37e39359a13f3fd0e63c5eaffb75d7881c62adc389be9ab8ff266005407377af604aadf6531fbc7c
+  data.tar.gz: 30c5648429bf14591dd25ee5eca20228303423db9e925204fdbedc4abafaf1d623237ed0d339f7120a76ab7c5ddd9bb9568d4b943ec4b6586ecc454656b460db

data/doc/text/news.md

@@ -1,5 +1,40 @@
 # News
 
+## 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
+
+  * Added support for normalizing IO open/close log message.
+
 ## 1.4.0: 2020-05-16
 
 ### 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,7 @@ module Grntest
         @context = context
         @custom_important_log_levels = []
         @ignore_log_patterns = {}
+        @sleep_after_command = nil
       end
 
       def execute(script_path)
@@ -321,28 +322,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 +365,38 @@ 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 execute_directive(parser, line, content)
         command, *options = Shellwords.split(content)
         case command
@@ -410,17 +433,21 @@ 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)
         else
           log_input(line)
           log_error("#|e| unknown directive: <#{command}>")
@@ -486,6 +513,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,8 +563,10 @@ module Grntest
           end
           next if thread_log_message?(entry.message)
           next if ignore_log_message?(entry.message)
-          formatted_log_level = format_log_level(entry.log_level)
-          important_messages << "\#|#{formatted_log_level}| #{entry.message}"
+          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
@@ -604,6 +634,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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.5
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-16 00:00:00.000000000 Z
+date: 2020-11-11 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