YUKI Hiroshi
null+****@clear*****
Tue Apr 14 19:26:25 JST 2015
YUKI Hiroshi 2015-04-14 19:26:25 +0900 (Tue, 14 Apr 2015) New Revision: f72b477ba1b3cc8f2865146b0d20d05f59c64390 https://github.com/droonga/drntest/commit/f72b477ba1b3cc8f2865146b0d20d05f59c64390 Message: Normalize responses of system.absorb-data Modified files: lib/drntest/responses-normalizer.rb Modified: lib/drntest/responses-normalizer.rb (+35 -3) =================================================================== --- lib/drntest/responses-normalizer.rb 2015-04-10 18:03:30 +0900 (44bcdb6) +++ lib/drntest/responses-normalizer.rb 2015-04-14 19:26:25 +0900 (3f8cf09) @@ -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 @@ -60,5 +64,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 -------------- next part -------------- HTML����������������������������...Download