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

Unified Diff: recipe_engine/unittests/fetch_test.py

Issue 2071443003: Introduce different repo types (git and gitiles) (Closed) Base URL: https://github.com/luci/recipes-py.git@master
Patch Set: rename Created 4 years, 6 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
« no previous file with comments | « recipe_engine/remote_run.py ('k') | unittests/package_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: recipe_engine/unittests/fetch_test.py
diff --git a/recipe_engine/unittests/fetch_test.py b/recipe_engine/unittests/fetch_test.py
index fae7c8be8b244f9cad48aa3ff0db148467966abc..4683ef44eea9e80c0a716f8bdbcbf5d94312e464 100755
--- a/recipe_engine/unittests/fetch_test.py
+++ b/recipe_engine/unittests/fetch_test.py
@@ -32,7 +32,8 @@ class TestGit(unittest.TestCase):
None,
None,
]
- fetch.ensure_git_checkout('repo', 'revision', 'dir', allow_fetch=True)
+ fetch.GitBackend().checkout(
+ 'repo', 'revision', 'dir', allow_fetch=True)
run_git.assert_has_calls([
mock.call(None, 'clone', '-q', 'repo', 'dir'),
mock.call('dir', 'config', 'remote.origin.url'),
@@ -49,7 +50,8 @@ class TestGit(unittest.TestCase):
None,
]
isdir.return_value = True
- fetch.ensure_git_checkout('repo', 'revision', 'dir', allow_fetch=True)
+ fetch.GitBackend().checkout(
+ 'repo', 'revision', 'dir', allow_fetch=True)
isdir.assert_has_calls([
mock.call('dir'),
mock.call('dir/.git'),
@@ -63,14 +65,16 @@ class TestGit(unittest.TestCase):
@mock.patch('recipe_engine.fetch._run_git')
def test_clone_not_allowed(self, run_git):
with self.assertRaises(fetch.FetchNotAllowedError):
- fetch.ensure_git_checkout('repo', 'revision', 'dir', allow_fetch=False)
+ fetch.GitBackend().checkout(
+ 'repo', 'revision', 'dir', allow_fetch=False)
@mock.patch('os.path.isdir')
@mock.patch('recipe_engine.fetch._run_git')
def test_unclean_filesystem(self, run_git, isdir):
isdir.side_effect = [True, False]
with self.assertRaises(fetch.UncleanFilesystemError):
- fetch.ensure_git_checkout('repo', 'revision', 'dir', allow_fetch=False)
+ fetch.GitBackend().checkout(
+ 'repo', 'revision', 'dir', allow_fetch=False)
isdir.assert_has_calls([
mock.call('dir'),
mock.call('dir/.git'),
@@ -82,7 +86,8 @@ class TestGit(unittest.TestCase):
run_git.return_value = 'not-repo'
isdir.return_value = True
with self.assertRaises(fetch.UncleanFilesystemError):
- fetch.ensure_git_checkout('repo', 'revision', 'dir', allow_fetch=False)
+ fetch.GitBackend().checkout(
+ 'repo', 'revision', 'dir', allow_fetch=False)
isdir.assert_has_calls([
mock.call('dir'),
mock.call('dir/.git'),
@@ -101,7 +106,8 @@ class TestGit(unittest.TestCase):
None,
]
isdir.return_value = True
- fetch.ensure_git_checkout('repo', 'revision', 'dir', allow_fetch=True)
+ fetch.GitBackend().checkout(
+ 'repo', 'revision', 'dir', allow_fetch=True)
isdir.assert_has_calls([
mock.call('dir'),
mock.call('dir/.git'),
@@ -122,7 +128,8 @@ class TestGit(unittest.TestCase):
]
isdir.return_value = True
with self.assertRaises(fetch.FetchNotAllowedError):
- fetch.ensure_git_checkout('repo', 'revision', 'dir', allow_fetch=False)
+ fetch.GitBackend().checkout(
+ 'repo', 'revision', 'dir', allow_fetch=False)
isdir.assert_has_calls([
mock.call('dir'),
mock.call('dir/.git'),
@@ -151,7 +158,8 @@ recipes_path: "path/to/recipes"
mock.Mock(content=''),
]
- fetch.ensure_gitiles_checkout('repo', 'revision', 'dir', allow_fetch=True)
+ fetch.GitilesBackend().checkout(
+ 'repo', 'revision', 'dir', allow_fetch=True)
requests_get.assert_has_calls([
mock.call('repo/+/revision?format=JSON'),
« no previous file with comments | « recipe_engine/remote_run.py ('k') | unittests/package_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698