Fix the svn version check issue, append '--quiet' to get svn version string.
In some enviroments (eg, OSX zh_CN), use 'svn --version' and splitting string
may get error version string. Use 'svn --version --quiet' to do stable svn
version check, which directly returns version string such as '1.7.0'.
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10805037
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@147670 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index a8d0063..f8a618f 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -178,8 +178,8 @@
options = self.Options(verbose=True)
gclient_scm.os.path.isdir(self.base_path).AndReturn(False)
gclient_scm.os.path.exists(self.base_path).AndReturn(False)
- gclient_scm.scm.SVN.Capture(['--version'], None
- ).AndReturn('svn, version 1.5.1 (r32289)')
+ gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None
+ ).AndReturn('1.5.1')
# It'll to a checkout instead.
gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
@@ -219,8 +219,8 @@
gclient_scm.os.makedirs(parent)
gclient_scm.os.path.exists(parent).AndReturn(True)
files_list = self.mox.CreateMockAnything()
- gclient_scm.scm.SVN.Capture(['--version'], None
- ).AndReturn('svn, version 1.6')
+ gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None
+ ).AndReturn('1.6')
gclient_scm.scm.SVN.RunAndGetFileList(
options.verbose,
['checkout', self.url, self.base_path, '--force', '--ignore-externals'],
@@ -344,8 +344,8 @@
gclient_scm.os.makedirs(parent)
gclient_scm.os.path.exists(parent).AndReturn(True)
files_list = self.mox.CreateMockAnything()
- gclient_scm.scm.SVN.Capture(['--version'], None
- ).AndReturn('svn, version 1.5.1 (r32289)')
+ gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None
+ ).AndReturn('1.5.1')
gclient_scm.scm.SVN.RunAndGetFileList(
options.verbose,
['checkout', self.url, self.base_path, '--force', '--ignore-externals'],
@@ -382,8 +382,8 @@
).AndReturn(file_info)
# _AddAdditionalUpdateFlags()
- gclient_scm.scm.SVN.Capture(['--version'], None
- ).AndReturn('svn, version 1.5.1 (r32289)')
+ gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None
+ ).AndReturn('1.5.1')
additional_args = []
if options.manually_grab_svn_rev:
@@ -483,8 +483,8 @@
# Checks to make sure that we support svn co --depth.
gclient_scm.scm.SVN.current_version = None
- gclient_scm.scm.SVN.Capture(['--version'], None
- ).AndReturn('svn, version 1.5.1 (r32289)')
+ gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None
+ ).AndReturn('1.5.1')
gclient_scm.os.path.exists(join(self.base_path, '.svn')).AndReturn(False)
gclient_scm.os.path.exists(join(self.base_path, 'DEPS')).AndReturn(False)
@@ -523,8 +523,8 @@
# Checks to make sure that we support svn co --depth.
gclient_scm.scm.SVN.current_version = None
- gclient_scm.scm.SVN.Capture(['--version'], None
- ).AndReturn('svn, version 1.4.4 (r25188)')
+ gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None
+ ).AndReturn('1.4.4')
gclient_scm.os.path.exists(self.base_path).AndReturn(True)
# When checking out a single file with svn 1.4, we use svn export
@@ -547,8 +547,8 @@
# Checks to make sure that we support svn co --depth.
gclient_scm.scm.SVN.current_version = None
- gclient_scm.scm.SVN.Capture(['--version'], None
- ).AndReturn('svn, version 1.5.1 (r32289)')
+ gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None
+ ).AndReturn('1.5.1')
gclient_scm.os.path.exists(join(self.base_path, '.svn')).AndReturn(False)
# If DEPS already exists, assume we're upgrading from svn1.4, so delete
# the old DEPS file.
@@ -595,8 +595,8 @@
}
# Checks to make sure that we support svn co --depth.
gclient_scm.scm.SVN.current_version = None
- gclient_scm.scm.SVN.Capture(['--version'], None
- ).AndReturn('svn, version 1.5.1 (r32289)')
+ gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None
+ ).AndReturn('1.5.1')
gclient_scm.os.path.exists(join(self.base_path, '.svn')).AndReturn(True)
# Verify no locked files.