grntest 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62457341e141c3050f3969b9b5aa2690565f5ee1
-  data.tar.gz: 03a4afb4769285f72c567536b48cffd18bd8ffb4
+  metadata.gz: 9681ce146649a19fe0099c41cac952e0c53c964c
+  data.tar.gz: accc76ff8605c28f26a07014082523f7d30134ec
 SHA512:
-  metadata.gz: 5bc15fab4a1cc065ba334603d7db4725d9930db36f5e578882b3612e688b201a618c1de006454a1f044628f00cda5ae7f46d6c48b4643acde8c5d67643a571e0
-  data.tar.gz: 5e2298d5aa1035ef11ae9c3b550e34aa51aa160887744e5bad29f454efa833787bcd2b02164278b41e3966b19e08fc250119bc9111d57a9ddfed2a715cfb41ea
+  metadata.gz: 210cd594bdfb36425deb5d28084acbf798bfd765021c002f7c00fb54d0ee64c7f69a335f269f9f4ec5229e8930692cccecabc74929004e24a66e9d7813f7615e
+  data.tar.gz: 51151bee659689a783ee6eed2f9c8d8fc48e1a71245cb9ec15c8cd8a9cb48a9c3bbff2b276e402a9d1abec46f740a6760d9d95daeb39b74d9152b6aae87f805f

data/doc/text/news.md

@@ -1,5 +1,14 @@
 # News
 
+## 1.1.1: 2015-02-03
+
+### Improvements
+
+  * mark reporter: Show test name on detecting memory leak.
+  * Support errno value in system call error message.
+  * Support groonga-httpd.
+  * Support groonga HTTP server.
+
 ## 1.1.0: 2014-10-25
 
 ### Improvements

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

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2015  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
@@ -41,10 +41,10 @@ module Grntest
         n_retried = 0
         begin
           send_command(command("status"))
-        rescue SystemCallError
+        rescue Error
           n_retried += 1
           sleep(0.1)
-          retry if n_retried < 10
+          retry if n_retried < 50
           raise
         end
       end
@@ -64,34 +64,45 @@ module Grntest
 
       MAX_URI_SIZE = 4096
       def send_load_command(command)
-        if command.to_uri_format.size <= MAX_URI_SIZE
+        lines = command.original_source.lines
+        if lines.size == 1 and command.to_uri_format.size <= MAX_URI_SIZE
           return send_normal_command(command)
         end
 
         values = command.arguments.delete(:values)
+        if lines.size >= 2 and lines[1].start_with?("[")
+          command.arguments.delete(:columns)
+          body = lines[1..-1].join
+        else
+          body = values
+        end
+
         request = Net::HTTP::Post.new(command.to_uri_format)
         request.content_type = "application/json; charset=UTF-8"
-        request.body = values
+        request.body = body
         response = Net::HTTP.start(@host, @port) do |http|
           http.read_timeout = @read_timeout
           http.request(request)
         end
-        normalize_response_data(response.body)
+        normalize_response_data(command, response.body)
       end
 
       def send_normal_command(command)
         url = "http://#{@host}:#{@port}#{command.to_uri_format}"
         begin
           open(url, :read_timeout => @read_timeout) do |response|
-            normalize_response_data(response.read)
+            normalize_response_data(command, response.read)
           end
+        rescue SystemCallError
+          message = "failed to read response from Groonga: <#{url}>: #{$!}"
+          raise Error.new(message)
         rescue OpenURI::HTTPError
           $!.io.read
         end
       end
 
-      def normalize_response_data(raw_response_data)
-        if raw_response_data.empty?
+      def normalize_response_data(command, raw_response_data)
+        if raw_response_data.empty? or command.output_type == :none
           raw_response_data
         else
           "#{raw_response_data}\n"

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

@@ -54,10 +54,12 @@ module Grntest
       def on_test_leak(worker, result)
         synchronize do
           report_test_result_mark("L(#{result.n_leaked_objects})", result)
-          unless result.checked?
-            puts
-            report_test(worker, result)
+          puts
+          report_test(worker, result)
+          if result.checked?
             report_actual(result)
+          else
+            report_marker(result)
           end
         end
       end

data/lib/grntest/test-runner.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2015  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
@@ -298,7 +298,7 @@ EOC
           end
           yield(executor)
         ensure
-          executor.shutdown
+          Process.kill(:TERM, pid)
           wait_groonga_http_shutdown(pid_file_path)
         end
       ensure
@@ -359,17 +359,30 @@ EOC
       config_file_path =
         context.temporary_directory_path + "groonga-httpd.conf"
       config_file_path.open("w") do |config_file|
-          config_file.puts(<<EOF)
+        config_file.puts(<<-GLOBAL)
 daemon off;
 master_process off;
 worker_processes 1;
 working_directory #{context.temporary_directory_path};
-error_log groonga-httpd-access.log;
+error_log groonga-httpd-error.log;
 pid #{pid_file_path};
 events {
      worker_connections 1024;
 }
+        GLOBAL
 
+        ENV.each do |key, value|
+          next unless key.start_with?("GRN_")
+          config_file.puts(<<-ENV)
+env #{key};
+          ENV
+        end
+        config_file.puts(<<-ENV)
+env LD_LIBRARY_PATH;
+env DYLD_LIBRARY_PATH;
+        ENV
+
+        config_file.puts(<<-HTTP)
 http {
      server {
              access_log groonga-httpd-access.log;
@@ -377,11 +390,12 @@ http {
              server_name #{host};
              location /d/ {
                      groonga_database #{context.relative_db_path};
+                     groonga_log_path #{context.log_path};
                      groonga on;
             }
      }
 }
-EOF
+        HTTP
       end
       config_file_path
     end
@@ -493,7 +507,8 @@ EOF
         path = $2
         post = $3
         normalized_path = File.basename(path)
-        post = "" unless post.end_with?(")")
+        post = post.gsub(/\[\d+\]\z/, "[?]")
+        post = "" unless /[\)\]]\z/ =~ post
         "#{pre}<#{normalized_path}>'#{post}"
       else
         content

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.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-25 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json