Revert r106358 "Get rid of RunShell*() functions in gcl.py to finish the conversion to subprocess2"

tests/gcl_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 gcl.py."""
 
 # pylint is too confused.
 # pylint: disable=E1101,E1103,E1120,W0212,W0403
 
 # Fixes include path.
 from super_mox import mox, SuperMoxTestBase
 
 import gcl
 import presubmit_support
 
 
 class GclTestsBase(SuperMoxTestBase):
   """Setups and tear downs the mocks but doesn't test anything as-is."""
   def setUp(self):
     SuperMoxTestBase.setUp(self)
     self.fake_root_dir = self.RootDir()
-    self.mox.StubOutWithMock(gcl.subprocess2, 'call')
-    self.mox.StubOutWithMock(gcl.subprocess2, 'check_output')
+    self.mox.StubOutWithMock(gcl, 'RunShell')
     self.mox.StubOutWithMock(gcl.SVN, 'CaptureInfo')
     self.mox.StubOutWithMock(gcl.SVN, 'GetCheckoutRoot')
     self.mox.StubOutWithMock(gcl, 'tempfile')
     self.mox.StubOutWithMock(gcl.upload, 'RealMain')
     self.mox.StubOutWithMock(gcl.gclient_utils, 'FileRead')
     self.mox.StubOutWithMock(gcl.gclient_utils, 'FileWrite')
     gcl.REPOSITORY_ROOT = None
     self.old_review_settings = gcl.CODEREVIEW_SETTINGS
     self.assertEquals(gcl.CODEREVIEW_SETTINGS, {})
 
@@ skipping 47 matching lines @@
         'CMDstatus', 'CMDtry', 'CMDupload',
         'ChangeInfo', 'Command', 'DEFAULT_LINT_IGNORE_REGEX',
         'DEFAULT_LINT_REGEX', 'CheckHomeForFile', 'DoPresubmitChecks',
         'ErrorExit', 'FILES_CACHE', 'FilterFlag', 'GenUsage',
         'GenerateChangeName', 'GenerateDiff', 'GetCLs', 'GetCacheDir',
         'GetCachedFile', 'GetChangelistInfoFile', 'GetChangesDir',
         'GetCodeReviewSetting', 'GetEditor', 'GetFilesNotInCL', 'GetInfoDir',
         'GetModifiedFiles', 'GetRepositoryRoot', 'ListFiles',
         'LoadChangelistInfoForMultiple', 'MISSING_TEST_MSG',
         'OptionallyDoPresubmitChecks', 'REPOSITORY_ROOT', 'REVIEWERS_REGEX',
-        'SVN', 'TryChange', 'UnknownFiles', 'Warn',
+        'RunShell', 'RunShellWithReturnCode', 'SVN',
+        'TryChange', 'UnknownFiles', 'Warn',
         'attrs', 'breakpad', 'defer_attributes', 'fix_encoding',
         'gclient_utils', 'json', 'main', 'need_change', 'need_change_and_args',
         'no_args', 'optparse', 'os', 'presubmit_support', 'random', 're',
         'rietveld',
         'string', 'subprocess2', 'sys', 'tempfile', 'time',
         'upload', 'urllib2',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(gcl, members)
 
@@ skipping 417 matching lines @@
   def mockCommit(self, change_info, commit_message, shell_output):
     gcl.tempfile.mkstemp(text=True).AndReturn((42, 'commit'))
     gcl.os.write(42, commit_message)
     gcl.os.close(42)
     gcl.tempfile.mkstemp(text=True).AndReturn((43, 'files'))
     gcl.os.write(43, '\n'.join(change_info.GetFileNames()))
     gcl.os.close(43)
 
     gcl.os.getcwd().AndReturn('prev')
     gcl.os.chdir(change_info.GetLocalRoot())
-    gcl.subprocess2.check_output(
-        ['svn', 'commit', '--file=commit', '--targets=files']
-        ).AndReturn(shell_output)
+    gcl.RunShell(['svn', 'commit', '--file=commit', '--targets=files'],
+        True).AndReturn(shell_output)
     if 'Committed' in shell_output:
       self.mox.StubOutWithMock(gcl, 'GetCodeReviewSetting')
       gcl.GetCodeReviewSetting('VIEW_VC').AndReturn('http://view/')
 
     gcl.os.remove('commit')
     gcl.os.remove('files')
     gcl.os.chdir('prev')
 
   def testPresubmitEmpty(self):
     self.mockLoad(files=[])
@@ skipping 39 matching lines @@
     self.assertEquals(retval, 0)
     self.assertEquals(change_info.description,
         'deescription\n\nCommitted: http://view/12345')
     self.assertTrue(change_info._deleted)
     self.assertTrue(change_info._closed)
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()