commit 22e29d4ec5cb7d72246241c0ba739e090e11863e
author dpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Wed Oct 28 00:48:26 2009 +0000
committer dpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Wed Oct 28 00:48:26 2009 +0000
tree 7702a0dc37b80ca1d9bec6aaf26a9542b3a9e733
parent b5fdbaad2633242e1cfb902b5f9eeef935e7df25

Make 'gclient update' and 'gclient status' quieter by default - they don't
print messages unless the underlying commands actually generate output.
This is a more conservative version of r28271.

  BUG=none
  TEST=none
  R=maruel

Review URL: http://codereview.chromium.org/344004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@30296 0039d316-1c4b-4281-b951-d872f2087c98

tests/gclient_scm_test.py

diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index 5ffa7b5..6f5cc04 100644
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -96,7 +96,7 @@
     # Checkout.
     gclient.os.path.exists(base_path).AndReturn(False)
     files_list = self.mox.CreateMockAnything()
-    gclient_scm.RunSVNAndGetFileList(['checkout', self.url, base_path],
+    gclient_scm.RunSVNAndGetFileList(options, ['checkout', self.url, base_path],
                                      self.root_dir, files_list)
 
     self.mox.ReplayAll()
@@ -109,7 +109,7 @@
     base_path = os.path.join(self.root_dir, self.relpath)
     gclient.os.path.isdir(base_path).AndReturn(True)
     gclient_scm.CaptureSVNStatus(base_path).AndReturn([])
-    gclient_scm.RunSVNAndGetFileList(['update', '--revision', 'BASE'],
+    gclient_scm.RunSVNAndGetFileList(options, ['update', '--revision', 'BASE'],
                                      base_path, mox.IgnoreArg())
 
     self.mox.ReplayAll()
@@ -135,7 +135,7 @@
     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.RunSVNAndGetFileList(['update', '--revision', 'BASE'],
+    gclient_scm.RunSVNAndGetFileList(options, ['update', '--revision', 'BASE'],
                                      base_path, mox.IgnoreArg())
     print(os.path.join(base_path, 'a'))
     print(os.path.join(base_path, 'b'))
@@ -161,7 +161,7 @@
     gclient_scm.os.path.isdir(file_path).AndReturn(True)
     gclient_utils.RemoveDirectory(file_path)
     file_list1 = []
-    gclient_scm.RunSVNAndGetFileList(['update', '--revision', 'BASE'],
+    gclient_scm.RunSVNAndGetFileList(options, ['update', '--revision', 'BASE'],
                                      base_path, mox.IgnoreArg())
 
     self.mox.ReplayAll()
@@ -174,8 +174,8 @@
     options = self.Options(verbose=True)
     base_path = os.path.join(self.root_dir, self.relpath)
     gclient.os.path.isdir(base_path).AndReturn(True)
-    gclient_scm.RunSVNAndGetFileList(['status'] + self.args, base_path,
-                                     []).AndReturn(None)
+    gclient_scm.RunSVNAndGetFileList(options, ['status'] + self.args,
+                                     base_path, []).AndReturn(None)
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
@@ -198,8 +198,8 @@
     # Checkout.
     gclient.os.path.exists(base_path).AndReturn(False)
     files_list = self.mox.CreateMockAnything()
-    gclient_scm.RunSVNAndGetFileList(['checkout', self.url, base_path],
-                                     self.root_dir, files_list)
+    gclient_scm.RunSVNAndGetFileList(options, ['checkout', self.url, 
+                                     base_path], self.root_dir, files_list)
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
@@ -227,7 +227,8 @@
     if options.manually_grab_svn_rev:
       additional_args = ['--revision', str(file_info['Revision'])]
     files_list = []
-    gclient_scm.RunSVNAndGetFileList(['update', base_path] + additional_args,
+    gclient_scm.RunSVNAndGetFileList(options,
+                                     ['update', base_path] + additional_args,
                                      self.root_dir, files_list)
 
     self.mox.ReplayAll()