drntest 1.1.9 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d31944a909862aa00b606d449ea226c0dce448e5
-  data.tar.gz: 87a72b69c7c79df457a39e3569ce8d04787ab805
+  metadata.gz: 27b62dbe0468bc4888089e7039c970faaaffe456
+  data.tar.gz: fd4b33fde9987e00a7121d54c4865ce34d7d8f77
 SHA512:
-  metadata.gz: ec0642a7e4af6688491e30a1754f5c71d48cdc5c8392499dedeccd23532e934c503c5f2d749943c696ebf304495c1a8948861a5a7b0b809335784600642498ee
-  data.tar.gz: be5b39894f8844cd6f26ced91b370e4dec9bff201a7bdf5d524601ca49e6812c187a05d92f59631375414c9284186b5710c9543e8eb4d330c2a2d4f815f4c86b
+  metadata.gz: 434fa2cdae0a39c5578b99ebcfca1465a0eb426ab6bf92892a65090cad6ba7750d7cc400ef21afecd9f4cfcfd512258cd386d18f261ae2983cd2207c317fd2a2
+  data.tar.gz: a17db9680240ec2e0a246797bf39936404c69359c46e5d2f4fb6f94093cc81b3875461002d7e7636e5d862e6ac83455a679426008bb4afdad86e90be9159c1ef

data/lib/drntest/directive.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Droonga Project
+# Copyright (C) 2013-2015  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
@@ -55,4 +55,47 @@ module Drntest
       @version = version
     end
   end
+
+  class EnableCompletionDirective < Directive
+  end
+
+  class DisableCompletionDirective < Directive
+  end
+
+  class EnableValidationDirective < Directive
+  end
+
+  class DisableValidationDirective < Directive
+  end
+
+  class SubscribeUntil < Directive
+    attr_reader :max_messages, :timeout_seconds
+
+    DEFAULT_TIMEOUT_SECONDS = 1
+
+    ONE_MINUTE_IN_SECONDS = 60
+    ONE_HOUR_IN_SECONDS = ONE_MINUTE_IN_SECONDS * 60
+
+    def initialize(parameters)
+      @max_messages = nil
+      @timeout_seconds = nil
+
+      parameters.each do |parameter|
+        case parameter
+        when /\A(\d+)(?:messages|msg)?\z/
+          @max_messages = $1.to_i
+        when /\A(\d+\.?|\.\d+|\d+\.\d+)s(?:ec(?:onds?)?)?\z/
+          @timeout_seconds = $1.to_f
+        when /\A(\d+\.?|\.\d+|\d+\.\d+)m(?:inutes?)?\z/
+          @timeout_seconds = $1.to_f * ONE_MINUTE_IN_SECONDS
+        when /\A(\d+\.?|\.\d+|\d+\.\d+)h(?:ours?)?\z/
+          @timeout_seconds = $1.to_f * ONE_HOUR_IN_SECONDS
+        end
+      end
+
+      if @max_messages.nil? and @timeout_seconds.nil?
+        @timeout_seconds = DEFAULT_TIMEOUT_SECONDS
+      end
+    end
+  end
 end

data/lib/drntest/response-normalizer.rb

@@ -39,6 +39,8 @@ module Drntest
         normalize_groonga_command_response!(body)
       elsif search_command?
         normalize_search_command_response!(body)
+      elsif system_status_command?
+        normalize_system_status_command_response!(body)
       end
     end
 
@@ -61,6 +63,10 @@ module Drntest
       @request["type"] == "search"
     end
 
+    def system_status_command?
+      @request["type"] == "system.status"
+    end
+
     def normalize_droonga_message_envelope!(message)
       normalized_in_reply_to = "request-id"
       in_reply_to = message["inReplyTo"]
@@ -70,6 +76,10 @@ module Drntest
         normalize_error_body!(message["body"])
       end
 
+      if message["date"].is_a?(String)
+        message["date"] = "0000-00-00T00:00:00.000000Z"
+      end
+
       errors = message["errors"]
       message["errors"] = normalize_errors(errors) if errors
     end
@@ -87,6 +97,7 @@ module Drntest
     end
 
     def normalize_error_body!(body)
+      return body unless body
       case body["name"]
       when "InvalidValue"
         message = body["message"]
@@ -97,6 +108,7 @@ module Drntest
     end
 
     def normalize_groonga_command_response!(response)
+      return unless response.is_a?(Array)
       normalize_groonga_command_header!(response[0])
       normalize_groonga_command_body!(response[1..-1])
     end
@@ -116,7 +128,8 @@ module Drntest
     end
 
     def normalize_groonga_command_body!(body)
-      return if not body.is_a?(Array) or body.empty?
+      return unless body.is_a?(Array)
+      return if body.empty?
 
       case @request["type"]
       when "table_list"
@@ -128,6 +141,8 @@ module Drntest
 
     TABLE_PATH_COLUMN_INDEX = 2
     def normalize_groonga_table_list_command_body!(body)
+      return unless body.is_a?(Array)
+      return if body.empty?
       tables = body[0][1..-1]
       return unless tables.is_a?(Array)
       tables.each do |table|
@@ -139,6 +154,8 @@ module Drntest
 
     COLUMN_PATH_COLUMN_INDEX = 2
     def normalize_groonga_column_list_command_body!(body)
+      return unless body.is_a?(Array)
+      return if body.empty?
       columns = body[0][1..-1]
       return unless columns.is_a?(Array)
       columns.each do |column|
@@ -157,6 +174,13 @@ module Drntest
       end
     end
 
+    def normalize_system_status_command_response!(response)
+      reporter = response["reporter"]
+      if reporter
+        response["reporter"] = reporter.sub(/:\d+/, ":0")
+      end
+    end
+
     def valid_start_time?(start_time)
       start_time.is_a?(Float) and start_time > 0
     end

data/lib/drntest/responses-normalizer.rb

@@ -21,9 +21,13 @@ module Drntest
     end
 
     def normalize
-      return @responses unless dump_command?
-
-      normalize_dump_responses
+      if dump_command?
+        normalize_dump_responses
+      elsif system_absorb_data_command?
+        normalize_system_absorb_data_responses
+      else
+        @responses 
+      end
     end
 
     private
@@ -34,6 +38,7 @@ module Drntest
     DUMP_TYPE_ORDER = [
       "dump.start",
       "dump.result",
+      "dump.forecast",
       "dump.table",
       "dump.column",
       "dump.record",
@@ -41,10 +46,15 @@ module Drntest
     ]
     def normalize_dump_responses
       @responses.sort_by do |response|
+        if response["error"] and response["response"]
+          response = response["response"]
+        end
         type = response["type"]
-        type_order = DUMP_TYPE_ORDER.index(type)
+        type_order = DUMP_TYPE_ORDER.index(type) || -1
         body = response["body"]
         case type
+        when "dump.forecast"
+          body_order = body["nMessages"]
         when "dump.table"
           body_order = body["name"]
         when "dump.column"
@@ -57,5 +67,33 @@ module Drntest
         [type_order, body_order]
       end
     end
+
+    def system_absorb_data_command?
+      @request["type"] == "system.absorb-data"
+    end
+
+    SYSTEM_ABSORB_DATA_ORDER = [
+      "system.absorb.start",
+      "system.absorb.result",
+      "system.absorb.progress",
+      "system.absorb.end",
+    ]
+    def normalize_system_absorb_data_responses
+      @responses.sort_by do |response|
+        if response["error"] and response["response"]
+          response = response["response"]
+        end
+        type = response["type"]
+        type_order = SYSTEM_ABSORB_DATA_ORDER.index(type) || -1
+        body = response["body"]
+        case type
+        when "system.absorb.progress"
+          body_order = body["nProcessedMessages"]
+        else
+          body_order = ""
+        end
+        [type_order, body_order]
+      end
+    end
   end
 end

data/lib/drntest/test-executor.rb

@@ -63,6 +63,8 @@ module Drntest
         @requests = []
         @responses = []
         @logging = true
+        @completion = nil
+        @validation = nil
       end
 
       def execute(operation)
@@ -98,19 +100,45 @@ module Drntest
             @results.omit(message)
             abort_execution
           end
+        when EnableCompletionDirective
+          @completion = true
+        when DisableCompletionDirective
+          @completion = false
+        when EnableValidationDirective
+          @validation = true
+        when DisableValidationDirective
+          @validation = false
+        when SubscribeUntil
+          @subscribe = true
+          @timeout_seconds = directive.timeout_seconds
+          @max_messages = directive.max_messages
         end
       end
 
       def execute_request(request)
+        options = {}
+        options[:completion] = @completion unless @completion.nil?
+        options[:validation] = @validation unless @validation.nil?
+
         if @logging
           responses = []
-          request_process = @client.request(request) do |raw_response|
-            responses << clean_response(request, raw_response)
+          if @subscribe
+            options[:subscription_timeout] = @timeout_seconds
+            options[:max_messages] = @max_messages
+            request_process = @client.subscribe(request, options) do |raw_response|
+              responses << clean_response(request, raw_response)
+            end
+            request_process.wait
+            @subscribe = false
+          else
+            request_process = @client.request(request, options) do |raw_response|
+              responses << clean_response(request, raw_response)
+            end
+            request_process.wait
           end
-          request_process.wait
           @responses.concat(normalize_responses(request, responses))
         else
-          @requests << @client.request(request) do
+          @requests << @client.request(request, options) do
           end
         end
       end

data/lib/drntest/test-loader.rb

@@ -91,6 +91,16 @@ module Drntest
         OmitDirective.new(options.first)
       when :require_catalog_version
         RequireCatalogVersionDirective.new(Integer(options.first))
+      when :enable_completion
+        EnableCompletionDirective.new
+      when :disable_completion
+        DisableCompletionDirective.new
+      when :enable_validation
+        EnableValidationDirective.new
+      when :disable_validation
+        DisableValidationDirective.new
+      when :subscribe_until
+        SubscribeUntil.new(options)
       else
         UnknownDirective.new(type, options)
       end

data/lib/drntest/test-runner.rb

@@ -26,6 +26,9 @@ require "drntest/engine"
 require "drntest/input-error"
 
 module Drntest
+  class EngineStalled < StandardError
+  end
+
   class TestRunner
     def initialize(config, target)
       @config = config
@@ -39,6 +42,7 @@ module Drntest
       @engine.start(@target_path)
       begin
         results = process_requests
+        raise EngineStalled.new if results.status == :no_response
       ensure
         @engine.stop
       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.9"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: drntest
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors:
 - Droonga Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: droonga-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: packnga
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -145,17 +145,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+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