Fix a typo that resulted in no tests to be run in depot_tools. :(

tests/gclient_scm_test.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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 gclient_scm.py."""
 
 # pylint: disable=E1101,E1103,W0403
 
 # Import before super_mox to keep valid references.
 from os import rename
 from shutil import rmtree
 from subprocess import Popen, PIPE, STDOUT
 import tempfile
 import unittest
 import __builtin__
 
 # Fixes include path.
 from super_mox import mox, StdoutCheck, TestCaseUtils, SuperMoxTestBase
 
 import logging
 import sys
 import gclient_scm
+import subprocess2
 
 # Shortcut since this function is used often
 join = gclient_scm.os.path.join
 
 
 class GCBaseTestCase(object):
   def assertRaisesError(self, msg, fn, *args, **kwargs):
     """Like unittest's assertRaises() but checks for Gclient.Error."""
     try:
       fn(*args, **kwargs)
     except gclient_scm.gclient_utils.Error, e:
       self.assertEquals(e.args[0], msg)
     else:
       self.fail('%s not raised' % msg)
 
 
 class BaseTestCase(GCBaseTestCase, SuperMoxTestBase):
   def setUp(self):
     SuperMoxTestBase.setUp(self)
-    self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'CheckCall')
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'CheckCallAndFilter')
     self.mox.StubOutWithMock(gclient_scm.gclient_utils,
         'CheckCallAndFilterAndHeader')
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileRead')
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileWrite')
-    self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'Popen')
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'RemoveDirectory')
     self._CaptureSVNInfo = gclient_scm.scm.SVN.CaptureInfo
     self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'Capture')
     self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'CaptureInfo')
     self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'CaptureStatus')
     self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'RunAndGetFileList')
+    self.mox.StubOutWithMock(subprocess2, 'communicate')
+    self.mox.StubOutWithMock(subprocess2, 'Popen')
     self._scm_wrapper = gclient_scm.CreateSCM
     gclient_scm.scm.SVN.current_version = None
     # Absolute path of the fake checkout directory.
     self.base_path = join(self.root_dir, self.relpath)
 
   def tearDown(self):
     SuperMoxTestBase.tearDown(self)
 
 
 class SVNWrapperTestCase(BaseTestCase):
@@ skipping 684 matching lines @@
     if not self.enabled:
       return
     options = self.Options()
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_path = join(self.base_path, 'b')
     open(file_path, 'w').writelines('conflict\n')
     try:
       scm.update(options, (), [])
       self.fail()
-    except gclient_scm.gclient_utils.Error:
+    except subprocess2.CalledProcessError:
       # The exact exception text varies across git versions so it's not worth
       # verifying it. It's fine as long as it throws.
       pass
     # Manually flush stdout since we can't verify it's content accurately across
     # git versions.
     sys.stdout.getvalue()
     sys.stdout.close()
 
   def testUpdateConflict(self):
     if not self.enabled:
@@ skipping 53 matching lines @@
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     logging.basicConfig(
         level=logging.DEBUG,
         format='%(asctime).19s %(levelname)s %(filename)s:'
                '%(lineno)s %(message)s')
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: