grntest 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fc4b8ad50b9380d89b7e00d312afdfd95a09cd0
-  data.tar.gz: ada70512822106409a4c74293b3311d96cce5031
+  metadata.gz: 918e4ad9c8dff964b3ed84306ab5b8c732f7e955
+  data.tar.gz: badb1c9d6184a8b06bdcf5a31ea0b3a522af6d8b
 SHA512:
-  metadata.gz: ee26ec65b89cbbbf721b89377f3e1afe307dbec61efb4ee5f681fe6f403f2e07c213a982174aee17b2be7a580d0a53a591af6ae87aadc20034cf4b2362ecccbe
-  data.tar.gz: 0bb94869865c873894a9b3bfeafba3b1522c3570137b42ffc8fe92c62f73a67acc9c693334e101c17f88d50bc8e036a17a821bfe6aed8a3d5e30852d9ec5b38c
+  metadata.gz: 5efc50e1de933eaa6f5ca269557671aeb74b53c3cad944a658da036bb2efb8228c8b43e768945a8fbc01595d881271de627980876943cd6fb1a6534624a061b2
+  data.tar.gz: 5a77064a41d9990c0acfe3bb89e90a000989fd9765411713a4efa9b2eb2066dc9fd7fa39080490ea771c4a313e6ad09d2e32ad6243c8fb93bda402f1349a37f5

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # News
 
+## 1.2.9: 2018-01-18
+
+### Improvements
+
+  * Added `logical_table_remove` to "may slow commands".
+
+  * Added `--read-timeout` option.
+
 ## 1.2.8: 2017-12-04
 
 ### Improvements

data/lib/grntest/execution-context.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
@@ -23,7 +23,9 @@ module Grntest
     attr_accessor :on_error
     attr_accessor :abort_tag
     attr_accessor :timeout
+    attr_accessor :read_timeout
     attr_accessor :default_timeout
+    attr_accessor :default_read_timeout
     attr_writer :suppress_backtrace
     attr_writer :collect_query_log
     attr_writer :debug
@@ -41,7 +43,9 @@ module Grntest
       @on_error = :default
       @abort_tag = nil
       @timeout = 0
-      @default_timeout = 0
+      @read_timeout = 3
+      @default_timeout = @timeout
+      @default_read_timeout = @read_timeout
       @omitted = false
       @suppress_backtrace = true
       @collect_query_log = false

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2017  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
@@ -39,9 +39,7 @@ module Grntest
         @loading = false
         @pending_command = ""
         @pending_load_command = nil
-        @current_command_name = nil
         @output_type = nil
-        @read_timeout = default_read_timeout
         @long_read_timeout = default_long_read_timeout
         @context = context
         @custom_important_log_levels = []
@@ -223,8 +221,8 @@ module Grntest
         new_value = timeout_value("read-timeout",
                                   line,
                                   timeout,
-                                  default_read_timeout)
-        @read_timeout = new_value unless new_value.nil?
+                                  @context.default_read_timeout)
+        @context.read_timeout = new_value unless new_value.nil?
       end
 
       def execute_directive_long_read_timeout(line, content, options)
@@ -441,7 +439,7 @@ module Grntest
 
       def read_all_readable_content(output, options={})
         content = ""
-        first_timeout = options[:first_timeout] || @read_timeout
+        first_timeout = options[:first_timeout] || @context.read_timeout
         timeout = first_timeout
         while IO.select([output], [], [], timeout)
           break if output.eof?
@@ -552,10 +550,6 @@ module Grntest
         output
       end
 
-      def default_read_timeout
-        3
-      end
-
       def default_long_read_timeout
         180
       end

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

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012-2013  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
@@ -65,6 +63,7 @@ module Grntest
       MAY_SLOW_COMMANDS = [
         "column_create",
         "load",
+        "logical_table_remove",
         "plugin_register",
         "register",
       ]

data/lib/grntest/test-runner.rb

@@ -140,7 +140,9 @@ module Grntest
         context.output_type = @tester.output_type
         context.timeout = @tester.timeout
         context.timeout = 0 if @tester.gdb
+        context.read_timeout = @tester.read_timeout
         context.default_timeout = context.timeout
+        context.default_read_timeout = context.read_timeout
         context.suppress_backtrace = @tester.suppress_backtrace?
         context.debug = @tester.debug?
         run_groonga(context) do |executor|

data/lib/grntest/tester.rb

@@ -218,6 +218,12 @@ module Grntest
           tester.timeout = timeout
         end
 
+        parser.on("--read-timeout=SECOND", Float,
+                  "Timeout for each read in test",
+                  "(#{tester.read_timeout})") do |timeout|
+          tester.read_timeout = timeout
+        end
+
         parser.on("--[no-]debug",
                   "Enable debug information",
                   "(#{tester.debug?})") do |debug|
@@ -266,6 +272,7 @@ module Grntest
     attr_accessor :gdb, :default_gdb
     attr_accessor :valgrind, :default_valgrind
     attr_accessor :timeout
+    attr_accessor :read_timeout
     attr_writer :valgrind_gen_suppressions
     attr_writer :reporter, :keep_database, :use_color
     attr_writer :stop_on_failure
@@ -303,6 +310,7 @@ module Grntest
       initialize_debuggers
       initialize_memory_checkers
       @timeout = 5
+      @read_timeout = 3
     end
 
     def run(*targets)

data/lib/grntest/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2017  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
@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Grntest
-  VERSION = "1.2.8"
+  VERSION = "1.2.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: Grntest is a testing framework for Groonga. You can write a test for Groonga