drntest 1.1.3 → 1.1.4

data/drntest.gemspec

@@ -1,6 +1,6 @@
 # -*- mode: ruby; coding: utf-8 -*-
 #
-# Copyright (C) 2013  Droonga Project
+# Copyright (C) 2013-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

data/lib/drntest/configuration.rb

@@ -17,7 +17,7 @@ module Drntest
   class Configuration
     attr_accessor :port, :host, :tag
     attr_accessor :base_path, :engine_config
-    attr_accessor :fluentd, :fluentd_options
+    attr_accessor :droonga_engine, :droonga_engine_options
     attr_accessor :catalog_version
 
     def initialize
@@ -26,8 +26,8 @@ module Drntest
       @tag             = "droonga"
       @base_path       = Pathname(Dir.pwd)
       @engine_config   = "default"
-      @fluentd         = "fluentd"
-      @fluentd_options = []
+      @droonga_engine  = "droonga-engine"
+      @droonga_engine_options = []
       @catalog_version = "2"
     end
 

data/lib/drntest/engine.rb

@@ -32,10 +32,6 @@ module Drntest
       teardown
     end
 
-    def config_file
-      @config.engine_config_path + "fluentd.conf"
-    end
-
     def catalog_file
       @config.engine_config_path + "catalog.json"
     end
@@ -61,7 +57,7 @@ module Drntest
     def extract_connection_info_catalog_v1(catalog_json)
       zone = catalog_json["zones"].first
       /\A([^:]+):(\d+)\/(.+)\z/ =~ zone
-      @config.host = "localhost" # $1
+      @config.host = $1
       @config.port = $2.to_i
       @config.tag  = $3
     end
@@ -90,7 +86,7 @@ module Drntest
         dataset["replicas"].each do |replica|
           replica["slices"].each do |slice|
             if /\A([^:]+):(\d+)\/([^.]+)/ =~ slice["volume"]["address"]
-              @config.host = "localhost" # $1
+              @config.host = $1
               @config.port = $2.to_i
               @config.tag  = $3
               return
@@ -101,13 +97,8 @@ module Drntest
     end
 
     def setup(target_path)
-      return unless temporary?
-
       setup_temporary_dir
 
-      temporary_config = temporary_dir + "fluentd.conf"
-      FileUtils.cp(config_file, temporary_config)
-
       catalog_json = load_catalog_json(target_path)
       temporary_catalog = temporary_dir + "catalog.json"
       temporary_catalog.open("w") do |output|
@@ -115,9 +106,11 @@ module Drntest
       end
 
       command = [
-        @config.fluentd,
-        "--config", temporary_config.to_s,
-        *@config.fluentd_options,
+        @config.droonga_engine,
+        "--host", @config.host,
+        "--port", @config.port.to_s,
+        "--tag", @config.tag,
+        *@config.droonga_engine_options,
       ]
       env = {
         "DROONGA_CATALOG" => temporary_catalog.to_s,
@@ -134,8 +127,6 @@ module Drntest
     end
 
     def teardown
-      return unless temporary?
-
       Process.kill(:TERM, @pid)
       Process.wait(@pid)
 
@@ -164,10 +155,6 @@ module Drntest
       temporary_base_dir + "drntest"
     end
 
-    def temporary?
-      @config.fluentd && config_file.exist?
-    end
-
     def ready?
       begin
         socket = TCPSocket.new(@config.host, @config.port)

data/lib/drntest/response-normalizer.rb

@@ -24,17 +24,11 @@ module Drntest
       return @response if @response.nil?
 
       normalized_response = @response.dup
-      normalize_fluent_message!(normalized_response)
-      normalize_droonga_message!(normalized_response[2])
+      normalize_droonga_message!(normalized_response)
       normalized_response
     end
 
     private
-    def normalize_fluent_message!(fluent_message)
-      normalized_start_time = 0
-      fluent_message[1] = normalized_start_time
-    end
-
     def normalize_droonga_message!(droonga_message)
       normalize_droonga_message_envelope!(droonga_message)
       normalize_droonga_message_body!(droonga_message["body"])
@@ -51,8 +45,13 @@ module Drntest
     GROONGA_COMMANDS = [
       "table_create",
       "table_remove",
+      "table_list",
       "column_create",
+      "column_remove",
+      "column_rename",
+      "column_list",
       "select",
+      "delete",
     ]
     def groonga_command?
       GROONGA_COMMANDS.include?(@request["type"])
@@ -82,6 +81,7 @@ module Drntest
 
     def normalize_groonga_command_response!(response)
       normalize_groonga_command_header!(response[0])
+      normalize_groonga_command_body!(response[1..-1])
     end
 
     def normalized_start_time
@@ -98,6 +98,39 @@ module Drntest
       header[2] = normalized_elapsed if valid_elapsed?(header[2])
     end
 
+    def normalize_groonga_command_body!(body)
+      return if not body.is_a?(Array) or body.empty?
+
+      case @request["type"]
+      when "table_list"
+        normalize_groonga_table_list_command_body!(body)
+      when "column_list"
+        normalize_groonga_column_list_command_body!(body)
+      end
+    end
+
+    TABLE_PATH_COLUMN_INDEX = 2
+    def normalize_groonga_table_list_command_body!(body)
+      tables = body[0][1..-1]
+      return unless tables.is_a?(Array)
+      tables.each do |table|
+        if table[TABLE_PATH_COLUMN_INDEX].is_a?(String)
+          table[TABLE_PATH_COLUMN_INDEX] = "/path/to/table"
+        end
+      end
+    end
+
+    COLUMN_PATH_COLUMN_INDEX = 2
+    def normalize_groonga_column_list_command_body!(body)
+      columns = body[0][1..-1]
+      return unless columns.is_a?(Array)
+      columns.each do |column|
+        if column[COLUMN_PATH_COLUMN_INDEX].is_a?(String)
+          column[COLUMN_PATH_COLUMN_INDEX] = "/path/to/column"
+        end
+      end
+    end
+
     def normalize_search_command_response!(response)
       response.each do |query_name, result|
         if valid_elapsed?(result["elapsedTime"])

data/lib/drntest/test-runner.rb

@@ -29,12 +29,13 @@ module Drntest
   class TestRunner
     def initialize(config, target)
       @config = config
-      @target_path = Pathname(target)
+      @target_path = Pathname(target).expand_path
       @engine = Engine.new(@config)
     end
 
     def run
-      print "#{@target_path}: "
+      relative_target_path = @target_path.relative_path_from(@config.suite_path)
+      print "#{relative_target_path}: "
       @engine.start(@target_path)
       begin
         results = process_requests

data/lib/drntest/tester.rb

@@ -95,16 +95,16 @@ module Drntest
         @config.engine_config = config
       end
 
-      parser.on("--fluentd=PATH",
-                "Path to the fluentd executable",
-                "(#{@config.fluentd})") do |fluentd|
-        @config.fluentd = fluentd
+      parser.on("--droonga-engine=PATH",
+                "Path to the droonga-engine executable",
+                "(#{@config.droonga_engine})") do |droonga_engine|
+        @config.droonga_engine = droonga_engine
       end
 
-      parser.on("--fluentd-options=OPTIONS",
-                "Options for fluentd",
+      parser.on("--droonga-engine-options=OPTIONS",
+                "Options for droonga-engine",
                 "You can specify this option multiple times") do |options|
-        @config.fluentd_options.concat(Shellwords.split(options))
+        @config.droonga_engine_options.concat(Shellwords.split(options))
       end
 
       parser.on("--test=PATTERN",

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.3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drntest
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &87655010 !ruby/object:Gem::Requirement
+  requirement: &72113610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *87655010
+  version_requirements: *72113610
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &87654800 !ruby/object:Gem::Requirement
+  requirement: &72113400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *87654800
+  version_requirements: *72113400
 - !ruby/object:Gem::Dependency
   name: droonga-client
-  requirement: &87654550 !ruby/object:Gem::Requirement
+  requirement: &72113150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *87654550
+  version_requirements: *72113150
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &87654340 !ruby/object:Gem::Requirement
+  requirement: &72112940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87654340
+  version_requirements: *72112940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &87654110 !ruby/object:Gem::Requirement
+  requirement: &72112710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87654110
+  version_requirements: *72112710
 - !ruby/object:Gem::Dependency
   name: packnga
-  requirement: &87653900 !ruby/object:Gem::Requirement
+  requirement: &72112500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87653900
+  version_requirements: *72112500
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &87653690 !ruby/object:Gem::Requirement
+  requirement: &72112290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87653690
+  version_requirements: *72112290
 description: ''
 email:
 - droonga@groonga.org