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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tests/gclient_scm_test.py

Issue 3421013: Add --ignore-externals to svn update and svn checkout invocations. (Closed)
Patch Set: also delete externals when reverting Created 9 years, 11 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 | « gclient_scm.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/gclient_scm_test.py
diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index f86bdcba6227be81e39074f195e0af691a77a8d7..00ae0d8c667fa4df6cb744ae73ba2ef312a6333a 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -138,11 +138,11 @@ class SVNWrapperTestCase(BaseTestCase):
# Checkout.
gclient_scm.os.path.exists(self.base_path).AndReturn(False)
files_list = self.mox.CreateMockAnything()
- gclient_scm.scm.SVN.RunAndGetFileList(options.verbose,
- ['checkout', self.url, self.base_path,
- '--force'],
- cwd=self.root_dir,
- file_list=files_list)
+ gclient_scm.scm.SVN.RunAndGetFileList(
+ options.verbose,
+ ['checkout', self.url, self.base_path, '--force', '--ignore-externals'],
+ cwd=self.root_dir,
+ file_list=files_list)
self.mox.ReplayAll()
scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
@@ -155,10 +155,11 @@ class SVNWrapperTestCase(BaseTestCase):
options = self.Options(verbose=True)
gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
gclient_scm.scm.SVN.CaptureStatus(self.base_path).AndReturn([])
- gclient_scm.scm.SVN.RunAndGetFileList(options.verbose,
- ['update', '--revision', 'BASE'],
- cwd=self.base_path,
- file_list=mox.IgnoreArg())
+ gclient_scm.scm.SVN.RunAndGetFileList(
+ options.verbose,
+ ['update', '--revision', 'BASE', '--ignore-externals'],
+ cwd=self.base_path,
+ file_list=mox.IgnoreArg())
self.mox.ReplayAll()
scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
@@ -182,10 +183,11 @@ class SVNWrapperTestCase(BaseTestCase):
gclient_scm.os.path.exists(file_path2).AndReturn(True)
gclient_scm.os.path.isfile(file_path2).AndReturn(True)
gclient_scm.os.remove(file_path2)
- gclient_scm.scm.SVN.RunAndGetFileList(options.verbose,
- ['update', '--revision', 'BASE'],
- cwd=self.base_path,
- file_list=mox.IgnoreArg())
+ gclient_scm.scm.SVN.RunAndGetFileList(
+ options.verbose,
+ ['update', '--revision', 'BASE', '--ignore-externals'],
+ cwd=self.base_path,
+ file_list=mox.IgnoreArg())
self.mox.ReplayAll()
scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
@@ -209,10 +211,11 @@ class SVNWrapperTestCase(BaseTestCase):
gclient_scm.os.path.islink(file_path).AndReturn(False)
gclient_scm.os.path.isdir(file_path).AndReturn(True)
gclient_scm.gclient_utils.RemoveDirectory(file_path)
- gclient_scm.scm.SVN.RunAndGetFileList(options.verbose,
- ['update', '--revision', 'BASE'],
- cwd=self.base_path,
- file_list=mox.IgnoreArg())
+ gclient_scm.scm.SVN.RunAndGetFileList(
+ options.verbose,
+ ['update', '--revision', 'BASE', '--ignore-externals'],
+ cwd=self.base_path,
+ file_list=mox.IgnoreArg())
self.mox.ReplayAll()
scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
@@ -225,8 +228,10 @@ class SVNWrapperTestCase(BaseTestCase):
options = self.Options(verbose=True)
gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
gclient_scm.scm.SVN.RunAndGetFileList(
- options.verbose, ['status'] + self.args,
- cwd=self.base_path, file_list=[]).AndReturn(None)
+ options.verbose,
+ ['status'] + self.args + ['--ignore-externals'],
+ cwd=self.base_path,
+ file_list=[]).AndReturn(None)
self.mox.ReplayAll()
scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
@@ -250,11 +255,11 @@ class SVNWrapperTestCase(BaseTestCase):
files_list = self.mox.CreateMockAnything()
gclient_scm.scm.SVN.Capture(['--version']
).AndReturn('svn, version 1.5.1 (r32289)')
- gclient_scm.scm.SVN.RunAndGetFileList(options.verbose,
- ['checkout', self.url, self.base_path,
- '--force'],
- cwd=self.root_dir,
- file_list=files_list)
+ gclient_scm.scm.SVN.RunAndGetFileList(
+ options.verbose,
+ ['checkout', self.url, self.base_path, '--force', '--ignore-externals'],
+ cwd=self.root_dir,
+ file_list=files_list)
self.mox.ReplayAll()
scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
relpath=self.relpath)
@@ -287,7 +292,7 @@ class SVNWrapperTestCase(BaseTestCase):
additional_args = ['--revision', str(file_info['Revision'])]
gclient_scm.scm.SVN.Capture(['--version']
).AndReturn('svn, version 1.5.1 (r32289)')
- additional_args.append('--force')
+ additional_args.extend(['--force', '--ignore-externals'])
files_list = []
gclient_scm.scm.SVN.RunAndGetFileList(
options.verbose,
@@ -321,9 +326,13 @@ class SVNWrapperTestCase(BaseTestCase):
files_list = self.mox.CreateMockAnything()
gclient_scm.gclient_utils.CheckCallAndFilterAndHeader(
['svn', 'checkout', '--depth', 'empty', self.url, self.base_path],
- always=True, cwd=self.root_dir)
- gclient_scm.scm.SVN.RunAndGetFileList(options.verbose, ['update', 'DEPS'],
- cwd=self.base_path, file_list=files_list)
+ always=True,
+ cwd=self.root_dir)
+ gclient_scm.scm.SVN.RunAndGetFileList(
+ options.verbose,
+ ['update', 'DEPS', '--ignore-externals'],
+ cwd=self.base_path,
+ file_list=files_list)
# Now we fall back on scm.update().
gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
@@ -382,9 +391,13 @@ class SVNWrapperTestCase(BaseTestCase):
files_list = self.mox.CreateMockAnything()
gclient_scm.gclient_utils.CheckCallAndFilterAndHeader(
['svn', 'checkout', '--depth', 'empty', self.url, self.base_path],
- always=True, cwd=self.root_dir)
- gclient_scm.scm.SVN.RunAndGetFileList(options.verbose, ['update', 'DEPS'],
- cwd=self.base_path, file_list=files_list)
+ always=True,
+ cwd=self.root_dir)
+ gclient_scm.scm.SVN.RunAndGetFileList(
+ options.verbose,
+ ['update', 'DEPS', '--ignore-externals'],
+ cwd=self.base_path,
+ file_list=files_list)
# Now we fall back on scm.update().
gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
« no previous file with comments | « gclient_scm.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698