Cleanup the code in gclient_utils to standardize on CheckCall nomenclature.

tests/scm_unittest.py

 #!/usr/bin/python
 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for scm.py."""
 
 from shutil import rmtree
 import tempfile
 
@@ skipping 11 matching lines @@
     except scm.gclient_utils.Error, e:
       self.assertEquals(e.args[0], msg)
     else:
       self.fail('%s not raised' % msg)
 
 
 class BaseSCMTestCase(BaseTestCase):
   def setUp(self):
     BaseTestCase.setUp(self)
     self.mox.StubOutWithMock(scm.gclient_utils, 'Popen')
-    self.mox.StubOutWithMock(scm.gclient_utils, 'SubprocessCall')
-    self.mox.StubOutWithMock(scm.gclient_utils, 'SubprocessCallAndFilter')
+    self.mox.StubOutWithMock(scm.gclient_utils, 'CheckCallAndFilter')
+    self.mox.StubOutWithMock(scm.gclient_utils, 'CheckCallAndFilterAndHeader')
 
 
 class RootTestCase(BaseSCMTestCase):
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
         'GetCasedPath', 'GenFakeDiff', 'GIT', 'SVN', 'ValidateEmail',
         'cStringIO', 'gclient_utils', 'glob', 'os', 're', 'shutil',
         'subprocess', 'sys', 'tempfile', 'time', 'xml',
     ]
@@ skipping 78 matching lines @@
     self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path)
     self.fake_root = self.Dir()
 
   def tearDown(self):
     rmtree(self.root_dir)
     SuperMoxBaseTestBase.tearDown(self)
 
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
-        'COMMAND', 'AssertVersion', 'Capture', 'CaptureStatus',
+        'AssertVersion', 'Capture', 'CaptureStatus',
         'FetchUpstreamTuple',
         'GenerateDiff', 'GetBranch', 'GetBranchRef', 'GetCheckoutRoot',
         'GetDifferentFiles', 'GetEmail', 'GetPatchName', 'GetSVNBranch',
-        'GetUpstreamBranch', 'IsGitSvn', 'RunAndFilterOutput',
-        'ShortBranchName',
+        'GetUpstreamBranch', 'IsGitSvn', 'ShortBranchName',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(scm.GIT, members)
 
   def testGetEmail(self):
     self.mox.StubOutWithMock(scm.GIT, 'Capture')
     scm.GIT.Capture(['config', 'user.email'], self.fake_root, error_ok=True
                     ).AndReturn(['mini@me.com', ''])
     self.mox.ReplayAll()
     self.assertEqual(scm.GIT.GetEmail(self.fake_root), 'mini@me.com')
 
 
 class SVNTestCase(BaseSCMTestCase):
   def setUp(self):
     BaseSCMTestCase.setUp(self)
     self.root_dir = self.Dir()
     self.args = self.Args()
     self.url = self.Url()
     self.relpath = 'asf'
 
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
-        'COMMAND', 'AssertVersion', 'Capture', 'CaptureBaseRevision',
+        'AssertVersion', 'Capture', 'CaptureBaseRevision',
         'CaptureHeadRevision', 'CaptureInfo', 'CaptureStatus',
         'current_version', 'DiffItem', 'GenerateDiff',
         'GetCheckoutRoot', 'GetEmail', 'GetFileProperty', 'IsMoved',
-        'IsMovedInfo', 'ReadSimpleAuth', 'Run', 'RunAndFilterOutput',
-        'RunAndGetFileList',
+        'IsMovedInfo', 'ReadSimpleAuth', 'Run', 'RunAndGetFileList',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(scm.SVN, members)
 
   def testGetCheckoutRoot(self):
     self.mox.StubOutWithMock(scm.SVN, 'CaptureInfo')
     self.mox.StubOutWithMock(scm, 'GetCasedPath')
     scm.os.path.abspath(self.root_dir + 'x').AndReturn(self.root_dir)
     scm.GetCasedPath(self.root_dir).AndReturn(self.root_dir)
     result1 = { "Repository Root": "Some root" }
@@ skipping 131 matching lines @@
       ('?      ', 'unversionned_file.txt'),
       ('M      ', 'build\\internal\\essential.vsprops'),
       ('A  +   ', 'chrome\\app\\d'),
       ('MM     ', 'chrome\\app\\DEPS'),
       ('C      ', 'scripts\\master\\factory\\gclient_factory.py'),
     ]
     self.assertEquals(sorted(info), sorted(expected))
 
   def testRun(self):
     param2 = 'bleh'
-    scm.gclient_utils.SubprocessCall(['svn', 'foo', 'bar'],
-                                     cwd=param2).AndReturn(None)
+    scm.gclient_utils.CheckCallAndFilterAndHeader(
+        ['svn', 'foo', 'bar'], cwd=param2,
+        always=True).AndReturn(None)
     self.mox.ReplayAll()
     scm.SVN.Run(['foo', 'bar'], cwd=param2)
 
   def testCaptureStatusEmpty(self):
     text = r"""<?xml version="1.0"?>
     <status>
     <target
        path="perf">
        </target>
        </status>"""
     proc = self.mox.CreateMockAnything()
     scm.gclient_utils.Popen(['svn', 'status', '--xml'],
                             cwd=None,
                             stderr=None,
                             stdout=scm.subprocess.PIPE).AndReturn(proc)
     proc.communicate().AndReturn((text, 0))
     self.mox.ReplayAll()
     info = scm.SVN.CaptureStatus(None)
     self.assertEquals(info, [])
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: