[Findit] Re-org code.

appengine/findit/waterfall/test/swarming_util_test.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 import json
 import mock
 import os
 import urllib
 import zlib
 
 from google.appengine.api.urlfetch_errors import DeadlineExceededError
 from google.appengine.api.urlfetch_errors import DownloadError
 from google.appengine.api.urlfetch_errors import ConnectionClosedError
 
 from common.http_client_appengine import HttpClientAppengine as HttpClient
-from common.retry_http_client import RetryHttpClient
+from libs.http.retry_http_client import RetryHttpClient
 from model.wf_config import FinditConfig
 from model.wf_step import WfStep
 from waterfall import swarming_util
 from waterfall import waterfall_config
 from waterfall.swarming_task_request import SwarmingTaskRequest
 from waterfall.test import wf_testcase
 
 
 class SwarmingHttpClient(RetryHttpClient):
 
@@ skipping 607 matching lines @@
     content, error = swarming_util._SendRequestToServer('url', HttpClient())
     self.assertIsNone(content)
     self.assertEqual(
         error['code'], swarming_util.URLFETCH_DEADLINE_EXCEEDED_ERROR)
 
   @mock.patch.object(RetryHttpClient, 'Get', side_effect=DownloadError())
   def testSendRequestToServerDownloadError(self, _):
     content, error = swarming_util._SendRequestToServer('url', HttpClient())
     self.assertIsNone(content)
     self.assertEqual(error['code'], swarming_util.URLFETCH_DOWNLOAD_ERROR)