Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Unified Diff: appengine/findit/waterfall/test/build_failure_analysis_test.py

Issue 2344443005: [Findit] Factoring the gitiles (etc) stuff out into its own directory (Closed)
Patch Set: reverted unintended change to an __init__ file Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: appengine/findit/waterfall/test/build_failure_analysis_test.py
diff --git a/appengine/findit/waterfall/test/build_failure_analysis_test.py b/appengine/findit/waterfall/test/build_failure_analysis_test.py
index 9dde0bc7a86c98a939c949341580948b4ae9fd0a..ab38681576e4b9e624dc7f9c92a50f0b3d052338 100644
--- a/appengine/findit/waterfall/test/build_failure_analysis_test.py
+++ b/appengine/findit/waterfall/test/build_failure_analysis_test.py
@@ -4,11 +4,11 @@
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
@@ -262,9 +262,9 @@ class BuildFailureAnalysisTest(wf_testcase.WaterfallTestCase):
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(
@@ -524,10 +524,10 @@ class BuildFailureAnalysisTest(wf_testcase.WaterfallTestCase):
]
}
}
- 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)
@@ -1103,14 +1103,14 @@ class BuildFailureAnalysisTest(wf_testcase.WaterfallTestCase):
'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)
@@ -1126,7 +1126,7 @@ class BuildFailureAnalysisTest(wf_testcase.WaterfallTestCase):
}
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))
@@ -1145,7 +1145,7 @@ class BuildFailureAnalysisTest(wf_testcase.WaterfallTestCase):
}
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))
@@ -1164,7 +1164,7 @@ class BuildFailureAnalysisTest(wf_testcase.WaterfallTestCase):
}
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))
@@ -1183,7 +1183,7 @@ class BuildFailureAnalysisTest(wf_testcase.WaterfallTestCase):
}
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))

Powered by Google App Engine
This is Rietveld 408576698