grntest 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e1250a739ad90db6969395e873269deeb2a19b08c99c8dfc121a8ff803282bc
-  data.tar.gz: d42dde8e1cfd602b07b3d6a86569c66609dbc9ea5d769f0d6c7dc9148c69ea3f
+  metadata.gz: 4e087007c74f9b61344ed535c71c018afa2ef0aa8bb10f6de910418b6ce1e794
+  data.tar.gz: de8df8defdb777227644bcd539aa5bfbd855962bec50a1baf7ec3bf58d5cf315
 SHA512:
-  metadata.gz: c8210a78653d3aa6067e0c9577931b1398f61b120a42570be03aee42ea8b56a458e807dd92f381312fdced2773d53a82d20cb0f331322c1f88d1eb104c1d82d0
-  data.tar.gz: d6eefca78c861859116fe65f9a87d17b2d573a8a9e22611b5290247be77223d2abffadb3faa3e74eff46b7ad27b46bab32a6f701afb2fc4ddba6be0fe45c4fdb
+  metadata.gz: 5c147cd30f72093e219d592a4db77f9f9675681987e1c3acb7561cf1c1a6cf8c41bf29fe008ab504505f4499c7c6643f7dbb5fabd7d37259f162f1748c891208
+  data.tar.gz: 5c39f666cd0dc957523404aa3cb294a82a3ead1af84c0e37f395dbb6933983bc3468fb02254663398fc1fd6f569132e90db7b11975036ede974ff60e4690d99e

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # News
 
+## 1.3.4: 2019-10-11
+
+### Improvements
+
+  * Added support for testing with installed Groonga.
+
+  * Added support for `send` operation in query log.
+
 ## 1.3.3: 2019-05-12
 
 ### Improvements

data/lib/grntest/execution-context.rb

@@ -48,7 +48,7 @@ module Grntest
       @on_error = :default
       @abort_tag = nil
       @timeout = 0
-      @read_timeout = 3
+      @read_timeout = 5
       @default_timeout = @timeout
       @default_read_timeout = @read_timeout
       @shutdown_wait_timeout = 5

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

@@ -430,7 +430,21 @@ module Grntest
       end
 
       def read_all_query_log
-        read_all_readable_content(context.query_log, :first_timeout => 0)
+        content = read_all_readable_content(context.query_log,
+                                            first_timeout: 0)
+        lines = content.lines
+        unless lines.empty?
+          timeout = Time.now + @context.read_timeout
+          while Time.now < timeout
+            break if /rc=-?\d+$/.match?(lines.last)
+            additional_content = read_all_readable_content(context.query_log,
+                                                           first_timeout: 0)
+            next if additional_content.empty?
+            content << additional_content
+            lines.concat(additional_content.lines)
+          end
+        end
+        content
       end
 
       def extract_important_messages(log)
@@ -590,8 +604,11 @@ module Grntest
           end
           statistic.each_operation do |operation|
             message = operation[:raw_message]
-            if operation[:name] == "cache"
+            case operation[:name]
+            when "cache"
               message = message.gsub(/\(\d+\)/, "(0)")
+            when "send"
+              message = message.gsub(/\(\d+\)(?:: \d+\/\d+)?\z/, "(0)")
             end
             log_query("\#:#{relative_elapsed_time} #{message}")
           end

data/lib/grntest/reporters/base-reporter.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2019  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
@@ -153,9 +153,9 @@ module Grntest
 
       def elapsed_time_status(elapsed_time)
         if long_elapsed_time?(elapsed_time)
-          elapsed_time_status = :failure
+          :failure
         else
-          elapsed_time_status = :not_checked
+          :not_checked
         end
       end
 

data/lib/grntest/test-runner.rb

@@ -259,7 +259,7 @@ module Grntest
           gdb_command.puts(<<-COMMANDS)
 break main
 run
-call chdir("#{context.temporary_directory_path}")
+call (int)chdir("#{context.temporary_directory_path}")
           COMMANDS
         end
         command_line << "--command=#{gdb_command_path}"
@@ -730,7 +730,7 @@ http {
       case content
       when /\A(.*: fopen: failed to open mruby script file: )<(.+?)>?\z/
         pre = $1
-        path = $2
+        _path = $2
         "#{pre}<PATH>"
       else
         content

data/lib/grntest/tester.rb

@@ -420,7 +420,14 @@ module Grntest
       unless groonga_path.absolute?
         groonga_path = Pathname(resolve_command_path(@groonga)).expand_path
       end
-      groonga_path.parent.parent + "plugins"
+      base_dir = groonga_path.parent.parent
+      installed_plugins_dir = base_dir + "lib" + "groonga" + "plugins"
+      build_plugins_dir = base_dir + "plugins"
+      if installed_plugins_dir.exist?
+        installed_plugins_dir
+      else
+        build_plugins_dir
+      end
     end
 
     private

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.3.3"
+  VERSION = "1.3.4"
 end

data/test/executors/test-base-executor.rb

@@ -22,21 +22,21 @@ class TestBaseExecutor < Test::Unit::TestCase
   end
 
   class TestErrorLogLevel < self
-    data("emergency" => "E",
-         "alert"     => "A",
-         "critical"  => "C",
-         "error"     => "e",
-         "warning"   => "w")
+    data("emergency" => :emergency,
+         "alert"     => :alert,
+         "critical"  => :critical,
+         "error"     => :error,
+         "warning"   => :warning)
     def test_important_log_level(level)
       assert do
         @executor.send(:important_log_level?, level)
       end
     end
 
-    data("notice"  => "n",
-         "info"    => "i",
-         "debug"   => "d",
-         "dump"    => "-")
+    data("notice"  => :notice,
+         "info"    => :information,
+         "debug"   => :debug,
+         "dump"    => :dump)
     def test_not_important_log_level(level)
       assert do
         not @executor.send(:important_log_level?, level)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-11 00:00:00.000000000 Z
+date: 2019-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -222,7 +222,6 @@ files:
 - test/executors/test-base-executor.rb
 - test/executors/test-standard-io-executor.rb
 - test/run-test.rb
-- test/test-log-parser.rb
 homepage: https://github.com/groonga/grntest
 licenses:
 - GPL-3.0+
@@ -249,7 +248,6 @@ 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/test-log-parser.rb
 - test/run-test.rb
 - test/executors/test-base-executor.rb
 - test/executors/test-standard-io-executor.rb

data/test/test-log-parser.rb

@@ -1,77 +0,0 @@
-# Copyright (C) 2014  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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-require "grntest/log-parser"
-
-class TestLogParser < Test::Unit::TestCase
-  def parse(log)
-    parser = Grntest::LogParser.new
-    entries = []
-    parser.parse(log) do |entry|
-      entries << entry.to_h
-    end
-    entries
-  end
-
-  sub_test_case("#parse") do
-    def test_one_line
-      log = "2014-09-27 17:31:53.046467|n| message"
-      assert_equal([
-                     {
-                       :timestamp => "2014-09-27 17:31:53.046467",
-                       :log_level => "n",
-                       :message   => "message",
-                     },
-                   ],
-                   parse(log))
-    end
-
-    def test_one_lines
-      log = <<-LOG
-2014-09-27 17:31:53.046467|n| notification message
-2014-09-27 17:31:54.046467|W| warning message
-      LOG
-      assert_equal([
-                     {
-                       :timestamp => "2014-09-27 17:31:53.046467",
-                       :log_level => "n",
-                       :message   => "notification message",
-                     },
-                     {
-                       :timestamp => "2014-09-27 17:31:54.046467",
-                       :log_level => "W",
-                       :message   => "warning message",
-                     },
-                   ],
-                   parse(log))
-    end
-
-
-    def test_multi_line
-      log = <<-LOG
-2014-09-27 17:31:53.046467|n| multi
-line message
-      LOG
-      assert_equal([
-                     {
-                       :timestamp => "2014-09-27 17:31:53.046467",
-                       :log_level => "n",
-                       :message   => "multi\nline message",
-                     },
-                   ],
-                   parse(log))
-    end
-  end
-end