Extract post process for response

droonga · Jul 14, 2014 · ca5ab10 · ca5ab10
1 parent 94c3ee8
commit ca5ab10
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/lib/drntest/test-executor.rb b/lib/drntest/test-executor.rb
@@ -102,19 +102,8 @@ def execute_directive(directive)
 
       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
+          request_process = @client.request(request) do |raw_response|
+            @responses << clean_response(request, raw_response)
           end
           request_process.wait
         else
@@ -123,6 +112,21 @@ def execute_request(request)
         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