grntest 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aee9882d86b34a5b1784921890c57144b581daa
-  data.tar.gz: 07030943c58f7d7d76d0713d555c536dda782961
+  metadata.gz: 47043c20a22bc0d82dc943e99ea96448e9716666
+  data.tar.gz: dd45a3f47b2019028e5293277d7fa20fb3c2a793
 SHA512:
-  metadata.gz: f6dc4dc972ad6a914839427cb165e4a08c76a9ee3ee63d25d89a680d74fcd41fc665f487851d9b94e24c534246299bb551bcb4d24cd1478e72d4c72eb79d10ed
-  data.tar.gz: 4e90459f4b0b42412cb9d2215225ea42d9899388ed797182627881a52275b5e5fa70fb3d4c41d92045ace87d1f2b953ad8f12dc5a0b5c6207697137c9c094172
+  metadata.gz: 96837152fe115554dfc492c3594b52ed78f11cf0c567b188586563c7fe7cacd52ac0802573d4fdbb278eb55bcbdc88eba4c16936bff34a894b0571290db6d55e
+  data.tar.gz: 4bed50348dddc4d2d1bd264a65424a8b306d3ed1026b9a334fe0891a8e1322022d1f7f0e583807c50ede9a05bf9c8f514f8f4c35988d1239cf85d022c4284491

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # News
 
+## 1.1.7: 2016-05-16
+
+### Improvements
+
+  * Added `timeout` directive.
+
+  * Supported defining environment variable by `#$NAME=VALUE` syntax.
+
 ## 1.1.6: 2016-04-27
 
 ### Improvements

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

@@ -39,6 +39,7 @@ module Grntest
         @pending_load_command = nil
         @current_command_name = nil
         @output_type = nil
+        @timeout = default_timeout
         @long_timeout = default_long_timeout
         @context = context
         @custom_important_log_levels = []
@@ -183,6 +184,29 @@ module Grntest
         FileUtils.cp_r(source.to_s, destination.to_s)
       end
 
+      def execute_directive_timeout(line, content, options)
+        timeout, = options
+        invalid_value_p = false
+        case timeout
+        when "default"
+          @timeout = default_timeout
+        when nil
+          invalid_value_p = true
+        else
+          begin
+            @timeout = Float(timeout)
+          rescue ArgumentError
+            invalid_value_p = true
+          end
+        end
+
+        if invalid_value_p
+          log_input(line)
+          message = "timeout must be number or 'default': <#{timeout}>"
+          log_error("#|e| [timeout] #{message}")
+        end
+      end
+
       def execute_directive_long_timeout(line, content, options)
         long_timeout, = options
         invalid_value_p = false
@@ -275,6 +299,8 @@ module Grntest
           execute_directive_include(line, content, options)
         when "copy-path"
           execute_directive_copy_path(line, content, options)
+        when "timeout"
+          execute_directive_timeout(line, content, options)
         when "long-timeout"
           execute_directive_long_timeout(line, content, options)
         when "on-error"
@@ -373,7 +399,7 @@ module Grntest
 
       def read_all_readable_content(output, options={})
         content = ""
-        first_timeout = options[:first_timeout] || 5
+        first_timeout = options[:first_timeout] || @timeout
         timeout = first_timeout
         while IO.select([output], [], [], timeout)
           break if output.eof?
@@ -458,6 +484,10 @@ module Grntest
         end
       end
 
+      def default_timeout
+        3
+      end
+
       def default_long_timeout
         180
       end

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

@@ -57,8 +57,6 @@ module Grntest
         options = {}
         if may_slow_command?(command)
           options[:first_timeout] = @long_timeout
-        elsif command.name == "dump"
-          options[:first_timeout] = 0.1
         end
         read_all_readable_content(@output, options)
       end

data/lib/grntest/test-runner.rb

@@ -196,7 +196,7 @@ module Grntest
           groonga_input = input_write
           groonga_output = output_read
 
-          env = {}
+          env = extract_custom_env
           spawn_options = {}
           command_line = groonga_command_line(context, spawn_options)
           if Platform.windows?
@@ -333,13 +333,15 @@ call chdir("#{context.temporary_directory_path}")
       port = 50041 + @worker.id
       pid_file_path = context.temporary_directory_path + "groonga.pid"
 
-      env = {}
+      env = extract_custom_env
       spawn_options = {}
       command_line = groonga_http_command(host, port, pid_file_path, context,
                                           spawn_options)
       pid = nil
       shutdown_wait_timeout = 5
-      options = {}
+      options = {
+        :read_timeout => @tester.timeout,
+      }
       if @tester.gdb
         options[:read_timeout] = 60 * 10
       end
@@ -451,7 +453,8 @@ events {
 }
         GLOBAL
 
-        ENV.each do |key, value|
+        env = ENV.to_hash.merge(extract_custom_env)
+        env.each do |key, value|
           next unless key.start_with?("GRN_")
           config_file.puts(<<-ENV)
 env #{key};
@@ -627,6 +630,21 @@ http {
       @worker.test_script_path
     end
 
+    def extract_custom_env
+      return {} unless test_script_path.exist?
+
+      env = {}
+      test_script_path.open("r:ascii-8bit") do |script_file|
+        script_file.each_line do |line|
+          case line
+          when /\A\#\$([a-zA-Z_\d]+)=(.*)/
+            env[$1] = $2.strip
+          end
+        end
+      end
+      env
+    end
+
     def have_extension?
       not test_script_path.extname.empty?
     end

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.1.6"
+  VERSION = "1.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -223,8 +223,8 @@ 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/run-test.rb
+- test/test-log-parser.rb
 - test/executors/test-base-executor.rb
 - test/executors/test-standard-io-executor.rb
-- test/test-log-parser.rb
+- test/run-test.rb
 has_rdoc: