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

Unified Diff: tests/fake_repos.py

Issue 7062029: Add a --deps-file flag to gclient to allow using a deps file other than DEPS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools/
Patch Set: '' Created 9 years, 7 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
« gclient.py ('K') | « gclient.py ('k') | tests/gclient_smoketest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/fake_repos.py
===================================================================
--- tests/fake_repos.py (revision 86896)
+++ tests/fake_repos.py (working copy)
@@ -433,7 +433,7 @@
'-q', '--non-interactive', '--no-auth-cache',
'--username', self.USERS[0][0], '--password', self.USERS[0][1]])
assert os.path.isdir(join(self.svn_checkout, '.svn'))
- def file_system(rev, DEPS):
+ def file_system(rev, DEPS, DEPS_ALT=None):
fs = {
'origin': 'svn@%(rev)d\n',
'trunk/origin': 'svn/trunk@%(rev)d\n',
@@ -447,6 +447,8 @@
for k in fs.iterkeys():
fs[k] = fs[k] % { 'rev': rev }
fs['trunk/src/DEPS'] = DEPS
+ if DEPS_ALT:
+ fs['trunk/src/DEPS.alt'] = DEPS_ALT
return fs
# Testing:
@@ -462,7 +464,7 @@
# TODO(maruel):
# - $matching_files
# - use_relative_paths
- fs = file_system(1, """
+ DEPS = """
vars = {
'DummyVariable': 'third_party',
}
@@ -474,7 +476,15 @@
'mac': {
'src/third_party/prout': '/trunk/third_party/prout',
},
-}""" % { 'svn_base': self.svn_base })
+}""" % { 'svn_base': self.svn_base }
+
+ DEPS_ALT = """
+deps = {
+ 'src/other2': '%(svn_base)strunk/other@2'
+}
+""" % { 'svn_base': self.svn_base }
+
+ fs = file_system(1, DEPS, DEPS_ALT)
self._commit_svn(fs)
fs = file_system(2, """
« gclient.py ('K') | « gclient.py ('k') | tests/gclient_smoketest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698