inlined GitilesRepository._DownloadChangeLogData

appengine/findit/handlers/test/help_triage_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 json
 import os
 import webapp2
 
 from testing_utils import testing
 
@@ skipping 111 matching lines @@
         'action': 'Reverted',
         'fixed_cl_commit_position': 342015,
         'fixed_revision': '123456789c08d27902060c241149ce193e4dd5dd',
         'fixing_build_number': 122,
         'fixing_cl_commit_position': 332062,
         'fixing_revision': '062a6f974d7c01234569ce193e4dd5'
     }
 }
 
 
+def _MockGetChangeLog(repo, revision):
+  file_name = os.path.join(
+      os.path.dirname(__file__), 'data', 'help_triage_test_data',
+      'change_log_' + revision)
+  with open(file_name) as f:
+    commit_log = f.read()
+
+  data = json.loads(commit_log[len(')]}\'\n'):])
+  return repo._ParseChangeLogFromLogData(data)
+
 
 class HelpTriageTest(testing.AppengineTestCase):
   app_module = webapp2.WSGIApplication([
       ('/help-triage', help_triage.HelpTriage),
   ], debug=True)
 
   def _GetBuildInfo(self, master_name, builder_name, build_number):
     file_name = os.path.join(
         os.path.dirname(__file__), 'data', 'help_triage_test_data',
         'build_data_%s_%s_%s.json' % (
             master_name, builder_name, build_number))
     if not os.path.isfile(file_name):
       return None
     with open(file_name, 'r') as f:
       return f.read()
 
   def _MockDownloadBuildData(
       self, master_name, builder_name, build_number):
     build = WfBuild.Get(master_name, builder_name, build_number)
     if not build:  # pragma: no cover
       build = WfBuild.Create(master_name, builder_name, build_number)
     build.data = self._GetBuildInfo(master_name, builder_name, build_number)
     build.put()
     return build
 
-  def _MockDownloadChangeLogData(self, revision):
-    file_name = os.path.join(
-        os.path.dirname(__file__), 'data', 'help_triage_test_data',
-        'change_log_' + revision)
-    with open(file_name) as f:
-      commit_log = f.read()
-    return revision, json.loads(commit_log[len(')]}\'\n'):])
-
   def setUp(self):
     super(HelpTriageTest, self).setUp()
     self.master_name = 'm'
     self.builder_name = 'b'
     self.mock_current_user(user_email='test@chromium.org', is_admin=True)
-    self.mock(build_util, 'DownloadBuildData',
-              self._MockDownloadBuildData)
-    self.mock(GitilesRepository, '_DownloadChangeLogData',
-              self._MockDownloadChangeLogData)
+    self.mock(build_util, 'DownloadBuildData', self._MockDownloadBuildData)
+    self.mock(GitilesRepository, 'GetChangeLog', _MockGetChangeLog)
 
   def _CreateAnalysis(self, build_number, first_failure, last_pass=None):
     analysis = WfAnalysis.Create(
         self.master_name, self.builder_name, build_number)
     analysis.result = {
       'failures': [
         {
           'last_pass': last_pass,
           'first_failure': first_failure,
           'suspected_cls': [],
@@ skipping 73 matching lines @@
         self.master_name, self.builder_name, 123)
     build = WfBuild.Create(self.master_name, self.builder_name, 123)
     build.data = self._GetBuildInfo(self.master_name, self.builder_name, 123)
     build.put()
 
     response = self.test_app.get('/help-triage', params={'url': build_url})
     expected_results = {}
 
     self.assertEqual(200, response.status_int)
     self.assertEqual(expected_results, response.json_body)