Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(308)

Unified Diff: appengine/swarming/tools/start_servers.py

Issue 1373133004: Fixes and add smoke test: hard timeout on isolated task. (Closed) Base URL: git@github.com:luci/luci-py.git@master
Patch Set: . Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « appengine/swarming/tools/start_bot.py ('k') | client/utils/logging_utils.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: appengine/swarming/tools/start_servers.py
diff --git a/appengine/swarming/tools/start_servers.py b/appengine/swarming/tools/start_servers.py
index 431fa7de4558aacb954edbbe11b5aa3a4e20ba65..b5c1cb29b474593fcbb439d913bf3ff82f5d3f7f 100755
--- a/appengine/swarming/tools/start_servers.py
+++ b/appengine/swarming/tools/start_servers.py
@@ -59,7 +59,7 @@ class LocalServers(object):
self.http_client.url_opener.addheaders.append(
('X-XSRF-Token', self._swarming_server.client.xsrf_token))
- def stop(self):
+ def stop(self, leak):
"""Stops the local Swarming and Isolate servers.
Returns the exit code with priority to non-zero.
@@ -67,10 +67,10 @@ class LocalServers(object):
exit_code = None
try:
if self._isolate_server:
- exit_code = exit_code or self._isolate_server.stop()
+ exit_code = exit_code or self._isolate_server.stop(leak)
finally:
if self._swarming_server:
- exit_code = exit_code or self._swarming_server.stop()
+ exit_code = exit_code or self._swarming_server.stop(leak)
return exit_code
def wait(self):
@@ -101,7 +101,7 @@ def main():
except KeyboardInterrupt:
print >> sys.stderr, '<Ctrl-C> received; stopping servers'
finally:
- exit_code = servers.stop()
+ exit_code = servers.stop(False)
return exit_code
« no previous file with comments | « appengine/swarming/tools/start_bot.py ('k') | client/utils/logging_utils.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698