| Index: appengine/findit/common/test/git_repository_test.py
|
| diff --git a/appengine/findit/common/test/git_repository_test.py b/appengine/findit/common/test/git_repository_test.py
|
| index 99a349c08ee6726be511b254cf8986bd9f17e2de..874728df9f0cc712874fbeba770a1a0bf4442f25 100644
|
| --- a/appengine/findit/common/test/git_repository_test.py
|
| +++ b/appengine/findit/common/test/git_repository_test.py
|
| @@ -299,59 +299,6 @@ class GitRepositoryTest(testing.AppengineTestCase):
|
| git_repo.http_client = http_client_for_git
|
| self.assertEqual(git_repo. http_client, http_client_for_git)
|
|
|
| - def testExtractCommitPositionAndCodeReviewUrl(self):
|
| - testcases = [
|
| - {
|
| - 'message':
|
| - 'balabala...\n'
|
| - '\n'
|
| - 'BUG=604502\n'
|
| - '\n'
|
| - 'Review-Url: https://codereview.chromium.org/1927593004\n'
|
| - 'Cr-Commit-Position: refs/heads/master@{#390254}\n',
|
| - 'commit_position': 390254,
|
| - 'code_review_url': 'https://codereview.chromium.org/1927593004',
|
| - },
|
| - {
|
| - 'message':
|
| - 'balabala...\n'
|
| - '\n'
|
| - 'BUG=409934\n'
|
| - '\n'
|
| - 'Review URL: https://codereview.chromium.org/547753003\n'
|
| - '\n'
|
| - 'Cr-Commit-Position: refs/heads/master@{#293661}',
|
| - 'commit_position': 293661,
|
| - 'code_review_url': 'https://codereview.chromium.org/547753003',
|
| - },
|
| - {
|
| - 'message':
|
| - 'balabala...\n'
|
| - '\n'
|
| - 'balabala...\n'
|
| - '\n'
|
| - 'R=test4@chromium.org\n'
|
| - '\n'
|
| - 'Review URL: https://codereview.chromium.org/469523002\n'
|
| - '\n'
|
| - 'Cr-Commit-Position: refs/heads/master@{#289120}',
|
| - 'commit_position': 289120,
|
| - 'code_review_url': 'https://codereview.chromium.org/469523002',
|
| - },
|
| - {
|
| - 'message': None,
|
| - 'commit_position': None,
|
| - 'code_review_url': None
|
| - }
|
| - ]
|
| -
|
| - for testcase in testcases:
|
| - (commit_position,
|
| - code_review_url) = self.git_repo.ExtractCommitPositionAndCodeReviewUrl(
|
| - testcase['message'])
|
| - self.assertEqual(commit_position, testcase['commit_position'])
|
| - self.assertEqual(code_review_url, testcase['code_review_url'])
|
| -
|
| def testEndingSlashInRepoUrl(self):
|
| git_repo1 = git_repository.GitRepository(self.repo_url,
|
| self.http_client_for_git)
|
| @@ -431,57 +378,6 @@ class GitRepositoryTest(testing.AppengineTestCase):
|
|
|
| self.assertEqual(expected_datetime, utc_datetime)
|
|
|
| - def testGetRevertedRevision(self):
|
| - message = (
|
| - 'Revert of test1\n\nReason for revert:\nrevert test1\n\n'
|
| - 'Original issue\'s description:\n> test 1\n>\n'
|
| - '> description of test 1.\n>\n> BUG=none\n> TEST=none\n'
|
| - '> R=test@chromium.org\n> TBR=test@chromium.org\n>\n'
|
| - '> Committed: https://chromium.googlesource.com/chromium/src/+/'
|
| - 'c9cc182781484f9010f062859cda048afefefefe\n'
|
| - '> Cr-Commit-Position: refs/heads/master@{#341992}\n\n'
|
| - 'TBR=test@chromium.org\nNOPRESUBMIT=true\nNOTREECHECKS=true\n'
|
| - 'NOTRY=true\nBUG=none\n\n'
|
| - 'Review URL: https://codereview.chromium.org/1278653002\n\n'
|
| - 'Cr-Commit-Position: refs/heads/master@{#342013}\n')
|
| -
|
| - reverted_revision = self.git_repo.GetRevertedRevision(message)
|
| - self.assertEqual('c9cc182781484f9010f062859cda048afefefefe',
|
| - reverted_revision)
|
| -
|
| - def testGetRevertedRevisionRevertOfRevert(self):
|
| - message = (
|
| - 'Revert of Revert\n\nReason for revert:\nRevert of revert\n\n'
|
| - 'Original issue\'s description:\n> test case of revert of revert\n>\n'
|
| - '> Reason for revert:\n> reason\n>\n> Original issue\'s description:\n'
|
| - '> > base cl\n> >\n> > R=kalman\n> > BUG=424661\n> >\n'
|
| - '> > Committed: https://crrev.com/34ea66b8ac1d56dadd670431063857ffdd\n'
|
| - '> > Cr-Commit-Position: refs/heads/master@{#326953}\n>\n'
|
| - '> TBR=test@chromium.org\n> NOPRESUBMIT=true\n'
|
| - '> NOTREECHECKS=true\n> NOTRY=true\n> BUG=424661\n>\n'
|
| - '> Committed: https://crrev.com/76a7e3446188256ca240dc31f78de29511a'
|
| - '2c322\n'
|
| - '> Cr-Commit-Position: refs/heads/master@{#327021}\n\n'
|
| - 'TBR=test@chromium.org\nNOPRESUBMIT=true\n'
|
| - 'NOTREECHECKS=true\nNOTRY=true\nBUG=424661\n\n'
|
| - 'Review URL: https://codereview.chromium.org/1161773008\n\n'
|
| - 'Cr-Commit-Position: refs/heads/master@{#332062}\n')
|
| -
|
| - reverted_revision = self.git_repo.GetRevertedRevision(message)
|
| - self.assertEqual('76a7e3446188256ca240dc31f78de29511a2c322',
|
| - reverted_revision)
|
| -
|
| - def testGetRevertedRevisionNoRevertedCL(self):
|
| - message = (
|
| - 'Test for not revert cl\n\n'
|
| - 'TBR=test@chromium.org\nNOPRESUBMIT=true\n'
|
| - 'NOTREECHECKS=true\nNOTRY=true\nBUG=424661\n\n'
|
| - 'Review URL: https://codereview.chromium.org/1161773008\n\n'
|
| - 'Cr-Commit-Position: refs/heads/master@{#332062}\n')
|
| -
|
| - reverted_revision = self.git_repo.GetRevertedRevision(message)
|
| - self.assertIsNone(reverted_revision)
|
| -
|
| def testGetCommitsBetweenRevisions(self):
|
| def _MockSendRequestForJsonResponse(*_):
|
| return {
|
|
|