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

tests/gclient_utils_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.
 
 # pylint: disable=E1101,W0403
 
+import os
 import StringIO
 
 # Fixes include path.
 from super_mox import SuperMoxTestBase
 import trial_dir
-import os
+
 import gclient_utils
+import subprocess2
 
 
 class GclientUtilBase(SuperMoxTestBase):
   def setUp(self):
     super(GclientUtilBase, self).setUp()
     gclient_utils.sys.stdout.flush = lambda: None
-    self.mox.StubOutWithMock(gclient_utils, 'Popen')
+    self.mox.StubOutWithMock(subprocess2, 'Popen')
+    self.mox.StubOutWithMock(subprocess2, 'communicate')
 
 
 class GclientUtilsUnittest(GclientUtilBase):
   """General gclient_utils.py tests."""
   def testMembersChanged(self):
     members = [
-        'CheckCall', 'CheckCallError', 'CheckCallAndFilter',
+        'CheckCallAndFilter',
         'CheckCallAndFilterAndHeader', 'Error', 'ExecutionQueue', 'FileRead',
         'FileWrite', 'FindFileUpwards', 'FindGclientRoot',
         'GetGClientRootAndEntries', 'IsDateRevision', 'MakeDateRevision',
-        'MakeFileAutoFlush', 'MakeFileAnnotated', 'PathDifference', 'Popen',
+        'MakeFileAutoFlush', 'MakeFileAnnotated', 'PathDifference',
         'PrintableObject', 'RemoveDirectory', 'SoftClone', 'SplitUrlRevision',
         'SyntaxErrorToError', 'WorkItem',
-        'errno', 'hack_subprocess', 'logging', 'os', 'Queue', 're', 'rmtree',
-        'stat', 'subprocess', 'sys','threading', 'time',
+        'errno', 'logging', 'os', 'Queue', 're', 'rmtree',
+        'stat', 'subprocess2', 'sys','threading', 'time',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(gclient_utils, members)
 
 
-class CheckCallTestCase(GclientUtilBase):
-  def testCheckCallSuccess(self):
-    args = ['boo', 'foo', 'bar']
-    process = self.mox.CreateMockAnything()
-    process.returncode = 0
-    gclient_utils.Popen(
-        args, cwd='bar',
-        stderr=None,
-        stdout=gclient_utils.subprocess.PIPE).AndReturn(process)
-    process.communicate().AndReturn(['bleh', 'foo'])
-    self.mox.ReplayAll()
-    gclient_utils.CheckCall(args, cwd='bar')
-
-  def testCheckCallFailure(self):
-    args = ['boo', 'foo', 'bar']
-    process = self.mox.CreateMockAnything()
-    process.returncode = 42
-    gclient_utils.Popen(
-        args,
-        stderr=None,
-        stdout=gclient_utils.subprocess.PIPE).AndReturn(process)
-    process.communicate().AndReturn(['bleh', 'foo'])
-    self.mox.ReplayAll()
-    try:
-      gclient_utils.CheckCall(args)
-      self.fail()
-    except gclient_utils.CheckCallError, e:
-      self.assertEqual(e.command, args)
-      self.assertEqual(e.cwd, None)
-      self.assertEqual(e.returncode, 42)
-      self.assertEqual(e.stdout, 'bleh')
-      self.assertEqual(e.stderr, 'foo')
-
 
 class CheckCallAndFilterTestCase(GclientUtilBase):
   class ProcessIdMock(object):
     def __init__(self, test_string):
       self.stdout = StringIO.StringIO(test_string)
     def wait(self):
       pass
 
   def _inner(self, args, test_string):
     cwd = 'bleh'
     gclient_utils.sys.stdout.write(
         '\n________ running \'boo foo bar\' in \'bleh\'\n')
     for i in test_string:
       gclient_utils.sys.stdout.write(i)
-    gclient_utils.Popen(
+    subprocess2.Popen(
         args,
         cwd=cwd,
-        stdout=gclient_utils.subprocess.PIPE,
-        stderr=gclient_utils.subprocess.STDOUT,
+        stdout=subprocess2.PIPE,
+        stderr=subprocess2.STDOUT,
         bufsize=0).AndReturn(self.ProcessIdMock(test_string))
 
     self.mox.ReplayAll()
     compiled_pattern = gclient_utils.re.compile(r'a(.*)b')
     line_list = []
     capture_list = []
     def FilterLines(line):
       line_list.append(line)
       assert isinstance(line, str), type(line)
       match = compiled_pattern.search(line)
@@ skipping 93 matching lines @@
     os.chmod(l3, 0)
     os.chmod(l2, 0)
     os.chmod(l1, 0)
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: