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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: appengine/findit/common/test/local_git_repository_test.py

Issue 2432113002: [Findit] Add local_git_repository (Closed)
Patch Set: Fix nits. 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
« appengine/findit/common/local_git_repository.py ('K') | « appengine/findit/common/repo_util.py ('k') | appengine/findit/common/test/repo_util_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: appengine/findit/common/test/local_git_repository_test.py
diff --git a/appengine/findit/common/test/local_git_parsers_test.py b/appengine/findit/common/test/local_git_repository_test.py
similarity index 54%
copy from appengine/findit/common/test/local_git_parsers_test.py
copy to appengine/findit/common/test/local_git_repository_test.py
index 868f890ed3643c43e9330d991800e17e9cefee6a..ee167de490640151357f110ef63897f1d83974b8 100644
--- a/appengine/findit/common/test/local_git_parsers_test.py
+++ b/appengine/findit/common/test/local_git_repository_test.py
@@ -3,59 +3,69 @@
# found in the LICENSE file.
from datetime import datetime
-from datetime import timedelta
+import pytz
+import os
+import subprocess
import textwrap
from testing_utils import testing
-from common import local_git_parsers
from common import blame
from common import change_log
+from common import repo_util
+from common.local_git_repository import LocalGitRepository
+CHECKOUT_ROOT_DIR = os.path.join(os.path.expanduser('~'), '.local_checkouts')
-class LocalGitParsersTest(testing.AppengineTestCase):
- def testGitBlameParser(self):
- output = textwrap.dedent(
- """
- revision_hash 18 18 3
- author test@google.com
- author-mail <test@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
- author-time 2013-03-11 17:13:36
- committer test@google.com
- committer-mail <test@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
- committer-time 2013-03-11 17:13:36
- summary add (mac) test for ttcindex in SkFontStream
- previous fe7533eebe777cc66c7f8fa7a03f00572755c5b4 src/core/SkFont.h
- filename src/core/SkFont.h
- * blabla line 1
- revision_hash 19 19
- * blabla line 2
- revision_hash 20 20
- * blabla line 3
- """
- )
+class LocalGitRepositoryTest(testing.AppengineTestCase):
- expected_regions = [blame.Region(18, 3, 'revision_hash', 'test@google.com',
- 'test@google.com',
- datetime(2013, 03, 11, 17, 13, 36))]
- expected_blame = blame.Blame('src/core/SkFont.h', 'rev')
- for expected_region in expected_regions:
- expected_blame.AddRegion(expected_region)
+ def setUp(self):
+ super(LocalGitRepositoryTest, self).setUp()
+ def _MockProcessCall(*_, **kwargs): # pylint: disable=W
+ return
- blame_result = local_git_parsers.GitBlameParser()(output,
- 'src/core/SkFont.h',
- 'rev')
- self.assertTrue(blame_result.revision, expected_blame.revision)
- self.assertTrue(blame_result.path, expected_blame.path)
- for region, expected_region in zip(blame_result, expected_blame):
- self.assertTrue(region.ToDict(), expected_region.ToDict())
+ self.mock(subprocess, 'call', _MockProcessCall)
+ self.mock(subprocess, 'check_call', _MockProcessCall)
+ self.local_repo = LocalGitRepository(
+ 'https://repo/path')
+
+ def testCloneOrUpdateRepoIfNeeded(self):
+ self.local_repo._CloneOrUpdateRepoIfNeeded()
+ self.assertTrue(self.local_repo.repo_url in
+ LocalGitRepository.updated_repos)
+
+ LocalGitRepository.updated_repos.remove(self.local_repo.repo_url)
+ self.mock(os.path, 'exists', lambda path: True)
+ self.local_repo._CloneOrUpdateRepoIfNeeded()
+ self.assertTrue(self.local_repo.repo_url in
+ LocalGitRepository.updated_repos)
+
+ self.local_repo._CloneOrUpdateRepoIfNeeded()
+ self.assertTrue(self.local_repo.repo_url in
+ LocalGitRepository.updated_repos)
+
+ def testRepoUrlSetter(self):
+ def _MockCloneOrUpdateRepoIfNeeded(*_):
+ if not hasattr(_MockCloneOrUpdateRepoIfNeeded, 'clone_or_update_count'):
+ _MockCloneOrUpdateRepoIfNeeded.clone_or_update_count = 0
+ _MockCloneOrUpdateRepoIfNeeded.clone_or_update_count += 1
+
+ repo = LocalGitRepository()
+ self.mock(repo, '_CloneOrUpdateRepoIfNeeded',
+ _MockCloneOrUpdateRepoIfNeeded)
+
+ repo.repo_url = 'https://repo/path'
+ self.assertEqual(_MockCloneOrUpdateRepoIfNeeded.clone_or_update_count, 1)
- def testGetFileChangeInfo(self):
- self.assertIsNone(local_git_parsers.GetFileChangeInfo('change type',
- None, None))
+ repo.repo_url = 'https://repo/path'
+ self.assertEqual(_MockCloneOrUpdateRepoIfNeeded.clone_or_update_count, 1)
- def testGitChangeLogParser(self):
+ repo.repo_url = 'https://repo/path2'
+ self.assertEqual(_MockCloneOrUpdateRepoIfNeeded.clone_or_update_count, 2)
+
+
+ def testGetChangeLog(self):
output = textwrap.dedent(
"""
commit revision
@@ -71,35 +81,31 @@ class LocalGitParsersTest(testing.AppengineTestCase):
committer-time 2016-07-13 20:37:06
--Message start--
- Revert commit messages...
- > Committed: https://c.com/+/c9cc182781484f9010f062859cda048afefefefe
- Review-Url: https://codereview.chromium.org/2391763002
- Cr-Commit-Position: refs/heads/master@{#425880}
+ blabla
--Message end--
:100644 100644 25f95f c766f1 M src/a/b.py
"""
)
- message = ('Revert commit messages...\n'
- '> Committed: https://c.com/+/'
- 'c9cc182781484f9010f062859cda048afefefefe\n'
- 'Review-Url: https://codereview.chromium.org/2391763002\n'
- 'Cr-Commit-Position: refs/heads/master@{#425880}')
+ def _MockGetLocalGitCommandOutput(*_):
+ return output
expected_changelog = change_log.ChangeLog(
'Test', 'test@google.com', datetime(2016, 7, 13, 20, 37, 6),
'Test', 'test@google.com', datetime(2016, 7, 13, 20, 37, 6),
- 'revision', 425880, message, [change_log.FileChangeInfo(
+ 'revision', None, 'blabla', [change_log.FileChangeInfo(
'modify', 'src/a/b.py', 'src/a/b.py')],
- 'https://repo/+/revision',
- 'https://codereview.chromium.org/2391763002',
- 'c9cc182781484f9010f062859cda048afefefefe')
+ 'https://repo/path/+/revision', None, None)
+ self.mock(repo_util, 'GetCommandOutput',
+ _MockGetLocalGitCommandOutput)
- changelog = local_git_parsers.GitChangeLogParser()(output, 'https://repo')
- self.assertTrue(expected_changelog.ToDict(), changelog.ToDict())
+ print self.local_repo.GetChangeLog('revision').ToDict()
+ print expected_changelog.ToDict()
+ self.assertEqual(self.local_repo.GetChangeLog('revision').ToDict(),
+ expected_changelog.ToDict())
- def testGitChangeLogsParser(self):
+ def testGetChangeLogs(self):
output = textwrap.dedent(
"""
**Changelog start**
@@ -140,25 +146,6 @@ class LocalGitParsersTest(testing.AppengineTestCase):
--Message end--
:100644 100644 7280f df186 A b/c.py
-
- **Changelog start**
- commit rev3
- tree d22d3786e135b83183cfeba5f3d8913959f56299
- parents ac7ee4ce7b8d39b22a710c58d110e0039c11cf9a
-
- author author3
- author-mail author3@chromium.org
- author-time 2016-06-02 10:53:03
-
- committer Commit bot
- committer-mail commit-bot@chromium.org
- committer-time 2016-06-02 10:54:14
-
- --Message start--
- Message 3
- --Message end--
-
- :100644 100644 3f2e 20a5 R078 b/c.py b/cc.py
"""
)
@@ -172,7 +159,7 @@ class LocalGitParsersTest(testing.AppengineTestCase):
'rev1', None,
'Message 1', [change_log.FileChangeInfo(
'delete', 'a/b.py', None)],
- 'http://repo/+/rev1', None, None),
+ 'https://repo/path/+/rev1', None, None),
change_log.ChangeLog('author2',
'author2@chromium.org',
datetime(2016, 6, 2, 10, 53, 3),
@@ -182,32 +169,74 @@ class LocalGitParsersTest(testing.AppengineTestCase):
'rev2', None,
'Message 2', [change_log.FileChangeInfo(
'add', None, 'b/c.py')],
- 'http://repo/+/rev2', None, None),
- change_log.ChangeLog('author3',
- 'author3@chromium.org',
- datetime(2016, 6, 2, 10, 53, 3),
- 'Commit bot',
- 'commit-bot@chromium.org',
- datetime(2016, 6, 2, 10, 54, 14),
- 'rev3', None,
- 'Message 3', [change_log.FileChangeInfo(
- 'rename', 'b/c.py', 'b/cc.py')],
- 'http://repo/+/rev3', None, None),
+ 'https://repo/path/+/rev2', None, None),
]
- changelogs = local_git_parsers.GitChangeLogsParser()(output, 'http://repo')
+ def _MockGetCommandOutput(*_):
+ return output
+
+ self.mock(repo_util, 'GetCommandOutput',
+ _MockGetCommandOutput)
+
+ changelogs = self.local_repo.GetChangeLogs('rev0', 'rev2')
for changelog, expected_changelog in zip(changelogs, expected_changelogs):
self.assertEqual(changelog.ToDict(), expected_changelog.ToDict())
- def testGitChangeLogsParserWithEmptyChangelog(self):
- output = '**Changelog start**\nblablabla'
- self.assertEqual(local_git_parsers.GitChangeLogsParser()(output,
- 'http://repo'), [])
+ def testGetChangeDiff(self):
+ def _MockGetCommandOutput(*_):
+ return 'diff'
+
+ self.mock(repo_util, 'GetCommandOutput',
+ _MockGetCommandOutput)
+ self.assertEqual(self.local_repo.GetChangeDiff('rev'), 'diff')
+ self.assertEqual(self.local_repo.GetChangeDiff('rev', 'file_path'), 'diff')
+
+ def testGetBlame(self):
+ output = textwrap.dedent(
+ """
+ revision_hash 18 18 3
+ author test@google.com
+ author-mail <test@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
+ author-time 2013-03-11 17:13:36
+ committer test@google.com
+ committer-mail <test@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
+ committer-time 2013-03-11 17:13:36
+ summary add (mac) test for ttcindex in SkFontStream
+ previous fe7533eebe777cc66c7f8fa7a03f00572755c5b4 src/core/SkFont.h
+ filename src/core/SkFont.h
+ * blabla line 1
+ revision_hash 19 19
+ * blabla line 2
+ revision_hash 20 20
+ * blabla line 3
+ """
+ )
+
+ def _MockGetCommandOutput(*_):
+ return output
+
+ self.mock(repo_util, 'GetCommandOutput',
+ _MockGetCommandOutput)
+
+ expected_regions = [blame.Region(18, 3, 'revision_hash', 'test@google.com',
+ 'test@google.com',
+ datetime(2013, 03, 11, 17, 13, 36))]
+ expected_blame = blame.Blame('src/core/SkFont.h', 'rev')
+ for expected_region in expected_regions:
+ expected_blame.AddRegion(expected_region)
+
+ blame_result = self.local_repo.GetBlame('src/core/SkFont.h', 'rev')
+ self.assertTrue(blame_result.revision, expected_blame.revision)
+ self.assertTrue(blame_result.path, expected_blame.path)
+ for region, expected_region in zip(blame_result, expected_blame):
+ self.assertTrue(region.ToDict(), expected_region.ToDict())
- def testGitDiffParser(self):
- output = 'output'
- self.assertEqual(output, local_git_parsers.GitDiffParser()(output))
+ def testGetSource(self):
+ def _MockGetLocalGitCommandOutput(*_):
+ return 'source'
- def testGitSourceParser(self):
- output = 'output'
- self.assertEqual(output, local_git_parsers.GitSourceParser()(output))
+ self.mock(repo_util, 'GetCommandOutput',
+ _MockGetLocalGitCommandOutput)
+ self.assertIsNone(self.local_repo.GetSource('file_path', 'rev'))
+ self.mock(os.path, 'isfile', lambda path: True)
+ self.assertEqual(self.local_repo.GetSource('file_path', 'rev'), 'source')
« appengine/findit/common/local_git_repository.py ('K') | « appengine/findit/common/repo_util.py ('k') | appengine/findit/common/test/repo_util_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698