drntest 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0547c3f918e801bb27ca905ed0bb4334d9e8d669
-  data.tar.gz: ab15e37a592e5283c6961f8b0ae411b5e4dbb737
+  metadata.gz: 2936c362e9ba9d86818f05359e6265230e09cdc3
+  data.tar.gz: 7909f8e3228fea4d10983ed32b1def6ff1c8cdae
 SHA512:
-  metadata.gz: d69cbb5988a4c22afde2c4352fcfc52952ece46bc51c6df1d15d6628e1fcb7ccbf419c5a123924dc9385247bb84b42136b64f6f77817d3ded4f7ab13671654a6
-  data.tar.gz: 02fb1c4d4fb77a75b2fea341dd50f2cfcf190a4a18503b07e8e18418deaae073501c15537b576ff0b4671815100cd46ffbb8a7dfab738d93d37948192b6fde17
+  metadata.gz: e9f83ca9ac5d0810d8f09f33764db71b09b5c4274d9fcef508e9c27ceda6f0db24b6a0c64e50fe5768fc258af5c88c224fd12c44ca82dbfb1227494ec0f1710f
+  data.tar.gz: f8aa0578d3992c89604ff37649ffb0cce4ae6381cbacc1e9d7bdfbe1f2ed7098eda84bf680bb1efa0225097c89accea77b96f74a08aefd925d181be7bdc44447

data/lib/drntest/engine.rb

@@ -105,25 +105,28 @@ module Drntest
         output.puts(JSON.pretty_generate(catalog_json))
       end
 
+      ready_notify_in, ready_notify_out = IO.pipe
       command = [
         @config.droonga_engine,
         "--host", @config.host,
         "--port", @config.port.to_s,
         "--tag", @config.tag,
+        "--base-dir", temporary_dir.to_s,
+        "--ready-notify-fd", ready_notify_out.fileno.to_s,
         *@config.droonga_engine_options,
       ]
       env = {
-        "DROONGA_BASE_DIR" => temporary_dir.to_s,
       }
       options = {
-        :chdir => temporary_dir.to_s,
         :err => :out,
+        ready_notify_out => ready_notify_out,
       }
       arguments = [env, *command]
       arguments << options
       @pid = Process.spawn(*arguments)
-
-      wait_until_ready
+      ready_notify_out.close
+      wait_until_ready(ready_notify_in)
+      ready_notify_in.close
     end
 
     def teardown
@@ -162,20 +165,8 @@ module Drntest
       temporary_base_dir + "drntest"
     end
 
-    def ready?
-      begin
-        socket = TCPSocket.new(@config.host, @config.port)
-        socket.close
-        true
-      rescue Errno::ECONNREFUSED
-        false
-      end
-    end
-
-    def wait_until_ready
-      until ready?
-        sleep 1
-      end
+    def wait_until_ready(ready_notify_in)
+      ready_notify_in.gets
     end
   end
 end

data/lib/drntest/responses-normalizer.rb

@@ -0,0 +1,61 @@
+# Copyright (C) 2014  Droonga Project
+#
+# 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/>.
+
+module Drntest
+  class ResponsesNormalizer
+    def initialize(request, responses)
+      @request = request
+      @responses = responses
+    end
+
+    def normalize
+      return @responses unless dump_command?
+
+      normalize_dump_responses
+    end
+
+    private
+    def dump_command?
+      @request["type"] == "dump"
+    end
+
+    DUMP_TYPE_ORDER = [
+      "dump.start",
+      "dump.result",
+      "dump.table",
+      "dump.column",
+      "dump.record",
+      "dump.end",
+    ]
+    def normalize_dump_responses
+      @responses.sort_by do |response|
+        type = response["type"]
+        type_order = DUMP_TYPE_ORDER.index(type)
+        body = response["body"]
+        case type
+        when "dump.table"
+          body_order = body["name"]
+        when "dump.column"
+          body_order = "#{body['table']}.#{body['name']}"
+        when "dump.record"
+          body_order = "#{body['table']}.#{body['key']}"
+        else
+          body_order = ""
+        end
+        [type_order, body_order]
+      end
+    end
+  end
+end

data/lib/drntest/test-executor.rb

@@ -17,6 +17,7 @@ require "droonga/client"
 
 require "drntest/test-loader"
 require "drntest/response-normalizer"
+require "drntest/responses-normalizer"
 
 module Drntest
   class TestExecutor
@@ -102,27 +103,33 @@ module Drntest
 
       def execute_request(request)
         if @logging
-          request_process = @client.request(request) do |response|
-            begin
-              @responses << normalize_response(request, response)
-            rescue
-              @responses << {
-                "error" => {
-                  "message" => "failed to normalize response",
-                  "detail" => "#{$!.message} (#{$!.class})",
-                  "backtrace" => $!.backtrace,
-                  "response" => response,
-                },
-              }
-            end
+          responses = []
+          request_process = @client.request(request) do |raw_response|
+            responses << clean_response(request, raw_response)
           end
           request_process.wait
+          @responses.concat(normalize_responses(request, responses))
         else
           @requests << @client.request(request) do
           end
         end
       end
 
+      def clean_response(request, raw_response)
+        begin
+          normalize_response(request, raw_response)
+        rescue
+          {
+            "error" => {
+              "message" => "failed to normalize response",
+              "detail" => "#{$!.message} (#{$!.class})",
+              "backtrace" => $!.backtrace,
+              "response" => raw_response,
+            },
+          }
+        end
+      end
+
       def consume_requests
         @requests.each do |request|
           request.wait
@@ -135,6 +142,11 @@ module Drntest
         normalizer.normalize
       end
 
+      def normalize_responses(request, responses)
+        normalizer = ResponsesNormalizer.new(request, responses)
+        normalizer.normalize
+      end
+
       def abort_execution
         throw(@abort_tag)
       end

data/lib/drntest/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drntest
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Droonga Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -116,24 +116,25 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
 - README.md
 - Rakefile
-- Gemfile
+- bin/drntest
 - drntest.gemspec
-- lib/drntest/test-loader.rb
-- lib/drntest/json-loader.rb
-- lib/drntest/test-results.rb
+- lib/drntest/configuration.rb
 - lib/drntest/directive.rb
-- lib/drntest/input-error.rb
-- lib/drntest/tester.rb
 - lib/drntest/engine.rb
-- lib/drntest/version.rb
-- lib/drntest/test-runner.rb
-- lib/drntest/configuration.rb
+- lib/drntest/input-error.rb
+- lib/drntest/json-loader.rb
+- lib/drntest/response-normalizer.rb
+- lib/drntest/responses-normalizer.rb
 - lib/drntest/test-executor.rb
+- lib/drntest/test-loader.rb
+- lib/drntest/test-results.rb
+- lib/drntest/test-runner.rb
 - lib/drntest/test-suites-result.rb
-- lib/drntest/response-normalizer.rb
-- bin/drntest
+- lib/drntest/tester.rb
+- lib/drntest/version.rb
 homepage: https://github.com/droonga/drntest
 licenses:
 - GPLv3 or later
@@ -154,10 +155,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Drntest is a testing framework for Droonga. You can write a test for Droonga
   by writing Droonga commands and expected result.
 test_files: []
-has_rdoc: