Commit c5118cb5 authored by rmistry@google.com's avatar rmistry@google.com

Catching for "No such process" in tear_down_git similar to tear_down_svn.

I cannot reproduce the test failures in https://chromiumcodereview.appspot.com/24047003/ but I figure there must be a good reason tear_down_svn had this check so adding it to tear_down_git.

Review URL: https://chromiumcodereview.appspot.com/23437029

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@222785 0039d316-1c4b-4281-b951-d872f2087c98
parent 6c03920a
......@@ -242,7 +242,7 @@ class FakeReposBase(object):
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 @@ class FakeReposBase(object):
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
......
......@@ -446,23 +446,23 @@ class GitCheckout(GitBaseTest):
commit_user=self.usr,
post_processors=post_processors)
def disabled_testAll(self):
def testAll(self):
root = os.path.join(self.root_dir, self.name)
self._check_base(self._get_co(None), root, None)
def disabled_testException(self):
def testException(self):
self._check_exception(
self._get_co(None),
'While running git apply --index -p1;\n fatal: corrupt patch at line '
'12\n')
def disabled_testProcess(self):
def testProcess(self):
self._test_process(self._get_co)
def _testPrepare(self):
self._test_prepare(self._get_co(None))
def disabled_testMove(self):
def testMove(self):
co = self._get_co(None)
self._check_move(co)
out = subprocess2.check_output(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment