Kouhei Sutou
null+****@clear*****
Tue Jul 15 22:18:36 JST 2014
Kouhei Sutou 2014-07-15 22:18:36 +0900 (Tue, 15 Jul 2014) New Revision: 5f26cab3e3a4152bf5d1ddaba9dfad97d38febf6 https://github.com/droonga/drntest/commit/5f26cab3e3a4152bf5d1ddaba9dfad97d38febf6 Message: Revert "Support start-sorting and end-sorting directive" This reverts commit 40620281cdb843e94c1b1d1e2c7f21aa01e0804d. It was useless feature. Modified files: lib/drntest/directive.rb lib/drntest/test-executor.rb lib/drntest/test-loader.rb Modified: lib/drntest/directive.rb (+0 -6) =================================================================== --- lib/drntest/directive.rb 2014-07-14 23:44:33 +0900 (bcdb5cd) +++ lib/drntest/directive.rb 2014-07-15 22:18:36 +0900 (0d600d7) @@ -55,10 +55,4 @@ module Drntest @version = version end end - - class StartSortingDirective < Directive - end - - class EndSortingDirective < Directive - end end Modified: lib/drntest/test-executor.rb (+1 -15) =================================================================== --- lib/drntest/test-executor.rb 2014-07-14 23:44:33 +0900 (78b460a) +++ lib/drntest/test-executor.rb 2014-07-15 22:18:36 +0900 (274de15) @@ -62,7 +62,6 @@ module Drntest @requests = [] @responses = [] @logging = true - @sort_buffer = nil end def execute(operation) @@ -98,26 +97,13 @@ module Drntest @results.omit(message) abort_execution end - when StartSortingDirective - @sort_buffer = [] - when EndSortingDirective - sorted_responses = @sort_buffer.sort_by do |response| - response["type"] - end - @responses.concat(sorted_responses) - @sort_buffer = nil end end def execute_request(request) if @logging request_process =****@clien*****(request) do |raw_response| - response = clean_response(request, raw_response) - if @sort_buffer - @sort_buffer << response - else - @responses << response - end + @responses << clean_response(request, raw_response) end request_process.wait else Modified: lib/drntest/test-loader.rb (+0 -4) =================================================================== --- lib/drntest/test-loader.rb 2014-07-14 23:44:33 +0900 (fe21870) +++ lib/drntest/test-loader.rb 2014-07-15 22:18:36 +0900 (37ac725) @@ -91,10 +91,6 @@ module Drntest OmitDirective.new(options.first) when :require_catalog_version RequireCatalogVersionDirective.new(Integer(options.first)) - when :start_sorting - StartSortingDirective.new - when :end_sorting - EndSortingDirective.new else UnknownDirective.new(type, options) end -------------- next part -------------- HTML����������������������������...Download