[Findit] Pull changelogs in batch.

appengine/findit/common/test/git_repository_test.py

 # Copyright 2014 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 base64
 from datetime import datetime
 import json
 import re
 
 from testing_utils import testing
@@ skipping 549 matching lines @@
                 {'commit': '1'}
             ]
         }
 
     self.mock(git_repository.GitRepository, '_SendRequestForJsonResponse',
               _MockSendRequestForJsonResponse)
     expected_commits = ['3', '2', '1']
     actual_commits = self.git_repo.GetCommitsBetweenRevisions('0', '3', n=2)
     self.assertEqual(expected_commits, actual_commits)
 
-  def _MockGetCommitsBetweenRevisions(self, *_):
-    return ['2', '1']
-
   def testGetChangeLogs(self):
 
-    def _MockGetChangeLog(*_):
-      return ChangeLog.FromDict(DUMMY_CHANGELOG_JSON)
+    def _MockSendRequestForJsonResponse(*_):
+      return {'log': [json.loads(COMMIT_LOG[5:])]}
 
-    self.mock(git_repository.GitRepository, 'GetCommitsBetweenRevisions',
-              self._MockGetCommitsBetweenRevisions)
-    self.mock(git_repository.GitRepository, 'GetChangeLog',
-              _MockGetChangeLog)
+    self.mock(git_repository.GitRepository, '_SendRequestForJsonResponse',
+              _MockSendRequestForJsonResponse)
+
+    changelogs = self.git_repo.GetChangeLogs('0', '2')
+
+    self.assertEqual(len(changelogs), 1)
+    self.assertEqual(changelogs[0].ToDict(), EXPECTED_CHANGE_LOG_JSON)
+
+  def testGetChangeLogsNextPage(self):
+    log1 = json.loads(COMMIT_LOG[5:])
+    log1['commit'] = 'first_commit'
+    log2 = log1.copy()
+    log2['commit'] = 'next_page_commit'
+
+    def _MockSendRequestForJsonResponse(*args, **_):
+      url = args[1]

[stgao, 2016/05/06 06:59:18]

Can we expand the arguments above instead?

[Sharu Jiang, 2016/05/06 17:46:12]

Done.

+      if 'next' in url:
+        return {'log': [log2]}
+
+      return {'log': [log1], 'next': 'next_page_commit'}
+
+    self.mock(git_repository.GitRepository, '_SendRequestForJsonResponse',
+              _MockSendRequestForJsonResponse)
 
     changelogs = self.git_repo.GetChangeLogs('0', '2')
 
     self.assertEqual(len(changelogs), 2)
-    self.assertEqual([changelogs[0].ToDict(), changelogs[1].ToDict()],
-                     [DUMMY_CHANGELOG_JSON, DUMMY_CHANGELOG_JSON])
 
-  def testGetChangeLogsFailToGetChangeLog(self):
 
-    def _MockGetChangeLog(*_):
-      return None
-
-    self.mock(git_repository.GitRepository, 'GetCommitsBetweenRevisions',
-              self._MockGetCommitsBetweenRevisions)
-    self.mock(git_repository.GitRepository, 'GetChangeLog',
-              _MockGetChangeLog)
-
-    self.assertRaisesRegexp(
-        Exception, 'Failed to pull changelog for revision 2',
-        self.git_repo.GetChangeLogs, '0', '2')