Add subprocess.Popen().kill() to python 2.5.

tests/gclient_smoketest.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.
 
 """Smoke tests for gclient.py.
 
 Shell out 'gclient' and run basic conformance tests.
 
 This test assumes GClientSmokeBase.URL_BASE is valid.
 """
 
 # pylint: disable=E1103,W0403
 
 import logging
 import os
 import re
 import subprocess
 import sys
 import unittest
 
 ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 sys.path.insert(0, os.path.dirname(ROOT_DIR))
-from tests.fake_repos import check_call, join, write, FakeReposTestBase
+from tests.fake_repos import join, write, FakeReposTestBase
+import subprocess2
 
 GCLIENT_PATH = os.path.join(os.path.dirname(ROOT_DIR), 'gclient')
 COVERAGE = False
 
 
 class GClientSmokeBase(FakeReposTestBase):
   def setUp(self):
     super(GClientSmokeBase, self).setUp()
     # Make sure it doesn't try to auto update when testing!
     self.env = os.environ.copy()
@@ skipping 1040 matching lines @@
 
 
 class GClientSmokeFromCheckout(GClientSmokeBase):
   # WebKit abuses this. It has a .gclient and a DEPS from a checkout.
   def setUp(self):
     super(GClientSmokeFromCheckout, self).setUp()
     self.enabled = self.FAKE_REPOS.set_up_svn()
     os.rmdir(self.root_dir)
     if self.enabled:
       usr, pwd = self.FAKE_REPOS.USERS[0]
-      check_call(
+      subprocess2.check_call(
           ['svn', 'checkout', self.svn_base + '/trunk/webkit',
            self.root_dir, '-q',
            '--non-interactive', '--no-auth-cache',
            '--username', usr, '--password', pwd])
 
   def testSync(self):
     if not self.enabled:
       return
     self.parseGclient(['sync', '--deps', 'mac', '--jobs', '1'],
         ['running', 'running'])
@@ skipping 78 matching lines @@
 
   if '-c' in sys.argv:
     COVERAGE = True
     sys.argv.remove('-c')
     if os.path.exists('.coverage'):
       os.remove('.coverage')
     os.environ['COVERAGE_FILE'] = os.path.join(
         os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
         '.coverage')
   unittest.main()