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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tests/gclient_smoketest.py

Issue 10454088: Automatically update submodule config entries on sync. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools/
Patch Set: Created 8 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_scm.py ('K') | « tests/gclient_scm_test.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/gclient_smoketest.py
===================================================================
--- tests/gclient_smoketest.py (revision 139694)
+++ tests/gclient_smoketest.py (working copy)
@@ -139,7 +139,8 @@
(i, results[i][0][2].lower(), path.lower()))
else:
self.checkString(results[i][0][2], path, (i, results[i][0][2], path))
- self.assertEquals(len(results), len(items), (stdout, items, len(results)))
+ self.assertEquals(len(results), len(items),
+ (stdout, items, len(items), len(results)))
return results
@staticmethod
@@ -797,7 +798,11 @@
self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
# Test unversioned checkout.
self.parseGclient(['sync', '--deps', 'mac', '--jobs', '1'],
- ['running', 'running', 'running', 'running', 'running'])
+ ['running', ('running', self.root_dir + '/src'),
+ 'running', ('running', self.root_dir + '/src/repo2'),
+ 'running',
+ ('running', self.root_dir + '/src/repo2/repo_renamed'),
+ 'running', 'running'])
# TODO(maruel): http://crosbug.com/3582 hooks run even if not matching, must
# add sync parsing to get the list of updated files.
tree = self.mangle_git_tree(('repo_1@2', 'src'),
@@ -816,7 +821,13 @@
self.parseGclient(['sync', '--jobs', '1', '--revision',
'src@' + self.githash('repo_1', 1),
'--deps', 'mac', '--delete_unversioned_trees'],
- ['running', 'running', ('running', diffdir), 'deleting'])
+ [('running', self.root_dir + '/src'),
+ ('running', self.root_dir + '/src/repo2'),
+ 'running',
+ ('running', self.root_dir + '/src/repo2/repo3'),
+ 'running',
+ ('running', self.root_dir + '/src/repo4'),
+ ('running', diffdir), 'deleting'])
tree = self.mangle_git_tree(('repo_1@1', 'src'),
('repo_2@2', 'src/repo2'),
('repo_3@1', 'src/repo2/repo3'),
@@ -827,7 +838,11 @@
expect3 = ('running', os.path.join(self.root_dir, 'src', 'repo2', 'repo3'))
expect4 = ('running', os.path.join(self.root_dir, 'src', 'repo4'))
self.parseGclient(['sync', '--deps', 'mac', '--jobs', '1'],
- ['running', 'running', 'running', expect3, expect4])
+ [('running', self.root_dir + '/src'),
+ ('running', self.root_dir + '/src/repo2'),
+ 'running',
+ ('running', self.root_dir + '/src/repo2/repo_renamed'),
+ 'running', 'running', expect3, expect4])
tree = self.mangle_git_tree(('repo_1@2', 'src'),
('repo_2@1', 'src/repo2'),
('repo_3@1', 'src/repo2/repo3'),
@@ -845,7 +860,13 @@
self.parseGclient(
['sync', '--deps', 'mac', '--jobs', '1',
'--revision', 'invalid@' + self.githash('repo_1', 1)],
- ['running', 'running', 'running', 'running', 'running'],
+ ['running',
+ ('running', self.root_dir + '/src'),
+ 'running',
+ ('running', self.root_dir + '/src/repo2'),
+ 'running',
+ ('running', self.root_dir + '/src/repo2/repo_renamed'),
+ 'running', 'running'],
'Please fix your script, having invalid --revision flags '
'will soon considered an error.\n')
tree = self.mangle_git_tree(('repo_1@2', 'src'),
@@ -862,7 +883,14 @@
self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
self.parseGclient(['sync', '--deps', 'mac', '--jobs', '1',
'--revision', self.githash('repo_1', 1)],
- ['running', 'running', 'running', 'running'])
+ ['running',
+ ('running', self.root_dir + '/src'),
+ 'running',
+ ('running', self.root_dir + '/src/repo2'),
+ 'running',
+ ('running', self.root_dir + '/src/repo2/repo3'),
+ 'running',
+ ('running', self.root_dir + '/src/repo4')])
tree = self.mangle_git_tree(('repo_1@1', 'src'),
('repo_2@2', 'src/repo2'),
('repo_3@1', 'src/repo2/repo3'),
@@ -876,7 +904,13 @@
self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
# Test unversioned checkout.
self.parseGclient(['sync', '--deps', 'mac', '--jobs', '8'],
- ['running', 'running', 'running', 'running', 'running'],
+ ['running',
+ ('running', self.root_dir + '/src'),
+ 'running',
+ ('running', self.root_dir + '/src/repo2'),
+ 'running',
+ ('running', self.root_dir + '/src/repo2/repo_renamed'),
+ 'running', 'running'],
untangle=True)
# TODO(maruel): http://crosbug.com/3582 hooks run even if not matching, must
# add sync parsing to get the list of updated files.
@@ -897,7 +931,13 @@
self.parseGclient(
['sync', '--revision', 'src@' + self.githash('repo_1', 1),
'--deps', 'mac', '--delete_unversioned_trees', '--jobs', '8'],
- ['running', 'running', expect3, 'deleting'],
+ [('running', self.root_dir + '/src'),
+ ('running', self.root_dir + '/src/repo2'),
+ 'running',
+ ('running', self.root_dir + '/src/repo4'),
+ 'running',
+ ('running', self.root_dir + '/src/repo2/repo3'),
+ expect3, 'deleting'],
untangle=True)
tree = self.mangle_git_tree(('repo_1@1', 'src'),
('repo_2@2', 'src/repo2'),
@@ -909,7 +949,11 @@
expect4 = os.path.join(self.root_dir, 'src', 'repo2', 'repo3')
expect5 = os.path.join(self.root_dir, 'src', 'repo4')
self.parseGclient(['sync', '--deps', 'mac', '--jobs', '8'],
- ['running', 'running', 'running',
+ [('running', self.root_dir + '/src'),
+ ('running', self.root_dir + '/src/repo2'),
+ 'running',
+ ('running', self.root_dir + '/src/repo2/repo_renamed'),
+ 'running', 'running',
('running', expect4),
('running', expect5)],
untangle=True)
@@ -1030,12 +1074,16 @@
'{"name": "src-git",'
'"url": "' + self.git_base + 'repo_1"}]'])
self.parseGclient(['sync', '--deps', 'mac', '--jobs', '1'],
- ['running', 'running', 'running',
+ ['running', 'running', ('running', self.root_dir + '/src-git'),
+ 'running',
# This is due to the way svn update is called for a single
# file when File() is used in a DEPS file.
('running', self.root_dir + '/src/file/other'),
- 'running', 'running', 'running', 'running', 'running', 'running',
- 'running', 'running'])
+ 'running', 'running', 'running', 'running',
+ ('running', self.root_dir + '/src/repo2'),
+ 'running',
+ ('running', self.root_dir + '/src/repo2/repo_renamed'),
+ 'running', 'running', 'running'])
tree = self.mangle_git_tree(('repo_1@2', 'src-git'),
('repo_2@1', 'src/repo2'),
('repo_3@2', 'src/repo2/repo_renamed'))
@@ -1066,7 +1114,7 @@
self.checkString('', stderr)
self.assertEquals(0, returncode)
results = self.splitBlock(stdout)
- self.assertEquals(12, len(results))
+ self.assertEquals(15, len(results))
tree = self.mangle_git_tree(('repo_1@2', 'src-git'),
('repo_2@1', 'src/repo2'),
('repo_3@2', 'src/repo2/repo_renamed'))
@@ -1093,8 +1141,15 @@
self.parseGclient(
['sync', '--deps', 'mac', '--jobs', '1', '--revision', '1',
'-r', 'src-git@' + self.githash('repo_1', 1)],
- ['running', 'running', 'running', 'running',
- 'running', 'running', 'running', 'running'],
+ ['running', 'running',
+ ('running', self.root_dir + '/src-git'),
+ 'running',
+ 'running', 'running', 'running',
+ ('running', self.root_dir + '/src/repo2'),
+ 'running',
+ ('running', self.root_dir + '/src/repo2/repo3'),
+ 'running',
+ ('running', self.root_dir + '/src/repo4')],
expected_stderr=
'You must specify the full solution name like --revision src@1\n'
'when you have multiple solutions setup in your .gclient file.\n'
« gclient_scm.py ('K') | « tests/gclient_scm_test.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698