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

tests/scm_unittest.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 scm.py."""
 
 # pylint: disable=E1101,W0403
 from __future__ import with_statement
 import logging
 import sys
 import unittest
 
 # Fixes include path.
 from super_mox import SuperMoxTestBase
 
 import fake_repos
 import scm
+import subprocess2
 
 
 class BaseTestCase(SuperMoxTestBase):
   # Like unittest's assertRaises, but checks for Gclient.Error.
   def assertRaisesError(self, msg, fn, *args, **kwargs):
     try:
       fn(*args, **kwargs)
     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, 'CheckCall')
     self.mox.StubOutWithMock(scm.gclient_utils, 'CheckCallAndFilter')
     self.mox.StubOutWithMock(scm.gclient_utils, 'CheckCallAndFilterAndHeader')
-    self.mox.StubOutWithMock(scm.gclient_utils, 'Popen')
+    self.mox.StubOutWithMock(subprocess2, 'Popen')
+    self.mox.StubOutWithMock(subprocess2, 'communicate')
 
 
 class RootTestCase(BaseSCMTestCase):
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
         'ElementTree', 'GetCasedPath', 'GenFakeDiff', 'GIT', 'SVN',
         'ValidateEmail',
         'cStringIO', 'determine_scm', 'gclient_utils', 'glob', 'logging', 'os',
-        're', 'shutil', 'subprocess', 'subprocess2', 'sys', 'tempfile', 'time',
+        're', 'subprocess2', 'sys', 'tempfile', 'time',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(scm, members)
 
 
 class GitWrapperTestCase(BaseSCMTestCase):
   def testMembersChanged(self):
     members = [
         'AssertVersion', 'Capture', 'CaptureStatus',
         'FetchUpstreamTuple',
@@ skipping 275 matching lines @@
     # Asserting the tree is not sufficient, svn status must come out clear too.
     self.assertEquals('', self._capture(['status']))
 
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     logging.basicConfig(level=logging.DEBUG)
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: