[Findit] Factoring the gitiles (etc) stuff out into its own directory

appengine/findit/waterfall/test/build_failure_analysis_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.
 
 from datetime import datetime
 
-from common.blame import Blame
-from common.blame import Region
-from common.change_log import FileChangeInfo
-from common.diff import ChangeType
-from common.git_repository import GitRepository
+from lib.gitiles.blame import Blame
+from lib.gitiles.blame import Region
+from lib.gitiles.change_log import FileChangeInfo
+from lib.gitiles.diff import ChangeType
+from lib.gitiles.gitiles_repository import GitilesRepository

[stgao, 2016/10/28 18:21:00]

order of import

[wrengr, 2016/10/28 19:24:49]

Done.

 from common.waterfall import failure_type
 from waterfall import build_failure_analysis
 from waterfall.failure_signal import FailureSignal
 from waterfall.test import wf_testcase
 
 
 class BuildFailureAnalysisTest(wf_testcase.WaterfallTestCase):
 
   def _MockGetChangeLog(self, revision):
 
@@ skipping 233 matching lines @@
     deps_info = {}
 
     justification = build_failure_analysis._CheckFiles(
         FailureSignal.FromDict(failure_signal_json),
         change_log_json, deps_info)
     self.assertIsNone(justification)
 
   def _testCheckFileInDependencyRoll(
       self, file_path_in_log, rolls, expected_score, line_numbers,
       expected_hints=None):
-    self.mock(GitRepository, 'GetChangeLog', self._MockGetChangeLog)
-    self.mock(GitRepository, 'GetBlame', self._MockGetBlame)
-    self.mock(GitRepository, 'GetCommitsBetweenRevisions',
+    self.mock(GitilesRepository, 'GetChangeLog', self._MockGetChangeLog)
+    self.mock(GitilesRepository, 'GetBlame', self._MockGetBlame)
+    self.mock(GitilesRepository, 'GetCommitsBetweenRevisions',
               self._MockGetCommitsBetweenRevisions)
     justification = build_failure_analysis._Justification()
     build_failure_analysis._CheckFileInDependencyRolls(
         file_path_in_log, rolls, justification, line_numbers)
     self.assertEqual(expected_score, justification.score)
     if expected_hints:
       self.assertEqual(expected_hints, justification._hints)
 
   def testCheckFileInDependencyRollWhenUnrelatedDependencyIsRolled(self):
     file_path_in_log = 'third_party/dep/f.cc'
@@ skipping 239 matching lines @@
             'rev': [
                 {
                     'path': 'src/third_party/dep1/',
                     'repo_url': 'https://url_dep1',
                     'old_revision': '7',
                     'new_revision': '9',
                 },
             ]
         }
     }
-    self.mock(GitRepository, 'GetChangeLog', self._MockGetChangeLog)
-    self.mock(GitRepository, 'GetCommitsBetweenRevisions',
+    self.mock(GitilesRepository, 'GetChangeLog', self._MockGetChangeLog)
+    self.mock(GitilesRepository, 'GetCommitsBetweenRevisions',
               self._MockGetCommitsBetweenRevisions)
-    self.mock(GitRepository, 'GetBlame', self._MockGetBlame)
+    self.mock(GitilesRepository, 'GetBlame', self._MockGetBlame)
     justification = build_failure_analysis._CheckFiles(
         FailureSignal.FromDict(failure_signal_json),
         change_log_json, deps_info)
     self.assertIsNotNone(justification)
     # The score is 1 because:
     # +1 rolled third_party/dep1/ and src/third_party/dep1/f.cc was in log.
     self.assertEqual(1, justification['score'])
 
   def testAnalyzeSuccessfulBuild(self):
     failure_info = {
@@ skipping 555 matching lines @@
         failure_info, change_logs, deps_info, failure_signals_json)
     self.assertEqual(expected_analysis_result, analysis_result)
     self.assertEqual([], suspected_cls)
 
   def testGetGitBlame(self):
     repo_info = {
         'repo_url': 'https://chromium.googlesource.com/chromium/src.git',
         'revision': '8'
     }
     file_path = 'a/b/c.cc'
-    self.mock(GitRepository, 'GetBlame', self._MockGetBlame)
+    self.mock(GitilesRepository, 'GetBlame', self._MockGetBlame)
     blame = build_failure_analysis._GetGitBlame(repo_info, file_path)
     self.assertIsNotNone(blame)
 
   def testGetGitBlameEmpty(self):
     repo_info = {}
     file_path = 'a/b/c.cc'
-    self.mock(GitRepository, 'GetBlame', self._MockGetBlame)
+    self.mock(GitilesRepository, 'GetBlame', self._MockGetBlame)
     blame = build_failure_analysis._GetGitBlame(repo_info, file_path)
     self.assertIsNone(blame)
 
   def testGetChangedLinesTrue(self):
     repo_info = {
         'repo_url': 'https://chromium.googlesource.com/chromium/src.git',
         'revision': '8'
     }
     touched_file = {
         'change_type': ChangeType.MODIFY,
         'old_path': 'a/b/c.cc',
         'new_path': 'a/b/c.cc'
     }
     line_numbers = [2, 7, 8]
     commit_revision = '7'
-    self.mock(GitRepository, 'GetBlame', self._MockGetBlame)
+    self.mock(GitilesRepository, 'GetBlame', self._MockGetBlame)
     changed_line_numbers = (
         build_failure_analysis._GetChangedLinesForChromiumRepo(
             repo_info, touched_file, line_numbers, commit_revision))
 
     self.assertEqual([2, 8], changed_line_numbers)
 
   def testGetChangedLinesDifferentRevision(self):
     repo_info = {
         'repo_url': 'https://chromium.googlesource.com/chromium/src.git',
         'revision': '9'
     }
     touched_file = {
         'change_type': ChangeType.MODIFY,
         'old_path': 'a/b/c.cc',
         'new_path': 'a/b/c.cc'
     }
     line_numbers = [2, 7, 8]
     commit_revision = '9'
-    self.mock(GitRepository, 'GetBlame', self._MockGetBlame)
+    self.mock(GitilesRepository, 'GetBlame', self._MockGetBlame)
     changed_line_numbers = (
         build_failure_analysis._GetChangedLinesForChromiumRepo(
             repo_info, touched_file, line_numbers, commit_revision))
 
     self.assertEqual([], changed_line_numbers)
 
   def testGetChangedLinesDifferentLine(self):
     repo_info = {
         'repo_url': 'https://chromium.googlesource.com/chromium/src.git',
         'revision': '8'
     }
     touched_file = {
         'change_type': ChangeType.MODIFY,
         'old_path': 'a/b/c.cc',
         'new_path': 'a/b/c.cc'
     }
     line_numbers = [15]
     commit_revision = '7'
-    self.mock(GitRepository, 'GetBlame', self._MockGetBlame)
+    self.mock(GitilesRepository, 'GetBlame', self._MockGetBlame)
     changed_line_numbers = (
         build_failure_analysis._GetChangedLinesForChromiumRepo(
             repo_info, touched_file, line_numbers, commit_revision))
 
     self.assertEqual([], changed_line_numbers)
 
   def testGetChangedLinesNoneBlame(self):
     repo_info = {
         'repo_url': 'https://chromium.googlesource.com/chromium/src.git',
         'revision': '10'
     }
     touched_file = {
         'change_type': ChangeType.MODIFY,
         'old_path': 'a/b/c.cc',
         'new_path': 'a/b/c.cc'
     }
     line_numbers = [2, 7, 8]
     commit_revision = '7'
-    self.mock(GitRepository, 'GetBlame', self._MockGetBlame)
+    self.mock(GitilesRepository, 'GetBlame', self._MockGetBlame)
     changed_line_numbers = (
         build_failure_analysis._GetChangedLinesForChromiumRepo(
             repo_info, touched_file, line_numbers, commit_revision))
 
     self.assertEqual([], changed_line_numbers)
 
   def testCheckFileSameLineChanged(self):
     def MockGetChangedLines(*_):
       return [1, 3]
     self.mock(build_failure_analysis, '_GetChangedLinesForChromiumRepo',
@@ skipping 16 matching lines @@
         touched_file, file_path_in_log, justification, file_name_occurrences,
         line_numbers, repo_info, commit_revision)
 
     expected_justification = {
         'score': 4,
         'hints': {
             'modified c.cc[1, 3] (and it was in log)': 4
         }
     }
     self.assertEqual(expected_justification, justification.ToDict())