From 5f17da327e46f1d97e3aa83914bf0a86dcaeea45 Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Sun, 14 Apr 2013 22:00:29 +0000 Subject: [PATCH] Fix presubmit check with newer version of AppEngine SDK v1.7.6. The kill() call may fail because the process already exited. TBR=iannucci@chromium.org BUG= Review URL: https://chromiumcodereview.appspot.com/13867008 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@194126 0039d316-1c4b-4281-b951-d872f2087c98 --- testing_support/local_rietveld.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testing_support/local_rietveld.py b/testing_support/local_rietveld.py index d79eea8cf..20aaa611e 100755 --- a/testing_support/local_rietveld.py +++ b/testing_support/local_rietveld.py @@ -139,7 +139,10 @@ class LocalRietveld(object): def stop_server(self): if self.test_server: - self.test_server.kill() + try: + self.test_server.kill() + except OSError: + pass self.test_server.wait() self.test_server = None self.port = None