Catching for "No such process" in tear_down_git

testing_support/fake_repos.py

Index: testing_support/fake_repos.py
===================================================================
--- testing_support/fake_repos.py	(revision 222767)
+++ testing_support/fake_repos.py	(working copy)
@@ -242,7 +242,7 @@
       logging.debug('Killing svnserve pid %s' % self.svnserve.pid)
       try:
         self.svnserve.kill()
-      except OSError, e:
+      except OSError as e:
         if e.errno != errno.ESRCH:   # no such process
           raise
       wait_for_port_to_free(self.host, self.svn_port)
@@ -267,7 +267,11 @@
         pid = int(self.git_pid_file.read())
         self.git_pid_file.close()
         logging.debug('Killing git daemon pid %s' % pid)
-        subprocess2.kill_pid(pid)
+        try:
+          subprocess2.kill_pid(pid)
+        except OSError as e:
+          if e.errno != errno.ESRCH:  # no such process
+            raise
         self.git_pid_file = None
       wait_for_port_to_free(self.host, self.git_port)
       self.git_port = None