summaryrefslogtreecommitdiffstats
path: root/tools/python
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-14 10:01:58 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-14 10:01:58 +0000
commitee7945e1b23cb7c7f92c40ec69deadfcd4799270 (patch)
tree71882327948af88065a1cac6d596ce7dc6ce925d /tools/python
parentce596d3858b6c1d599fa160e6f40beadd8da2809 (diff)
downloadchromium_src-ee7945e1b23cb7c7f92c40ec69deadfcd4799270.zip
chromium_src-ee7945e1b23cb7c7f92c40ec69deadfcd4799270.tar.gz
chromium_src-ee7945e1b23cb7c7f92c40ec69deadfcd4799270.tar.bz2
Give time to free the port when shutting down apache on OSX.
Sometimes the next perf test would try to start the http server, but the port wouldn't be available. This matches what we do on Linux. In the long run, we should use a random port to avoid having to wait. BUG=29228 Review URL: https://chromiumcodereview.appspot.com/10834299 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/python')
-rw-r--r--tools/python/google/platform_utils_mac.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/python/google/platform_utils_mac.py b/tools/python/google/platform_utils_mac.py
index 2e56a3d..c4686fb 100644
--- a/tools/python/google/platform_utils_mac.py
+++ b/tools/python/google/platform_utils_mac.py
@@ -140,4 +140,6 @@ class PlatformUtility(object):
if not self._httpd_cmd_string:
return ["true"] # Haven't been asked for the start cmd yet. Just pass.
- return [self._bash, "-c", self._httpd_cmd_string + ' -k stop']
+ # Add a sleep after the shutdown because sometimes it takes some time for
+ # the port to be available again.
+ return [self._bash, "-c", self._httpd_cmd_string + ' -k stop && sleep 5']