| OLD | NEW |
| 1 #!/usr/bin/python | 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | |
| 3 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 5 | 4 |
| 6 """Platform-specific utility methods shared by several scripts.""" | 5 """Platform-specific utility methods shared by several scripts.""" |
| 7 | 6 |
| 8 import os | 7 import os |
| 9 import subprocess | 8 import subprocess |
| 10 | 9 |
| 11 import google.path_utils | 10 import google.path_utils |
| 12 | 11 |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 | 139 |
| 141 This tries to fetch the pid of httpd (if available) and returns the | 140 This tries to fetch the pid of httpd (if available) and returns the |
| 142 command to kill it. If pid is not available, kill all httpd processes | 141 command to kill it. If pid is not available, kill all httpd processes |
| 143 """ | 142 """ |
| 144 | 143 |
| 145 if not self._httpd_cmd_string: | 144 if not self._httpd_cmd_string: |
| 146 return ["true"] # Haven't been asked for the start cmd yet. Just pass. | 145 return ["true"] # Haven't been asked for the start cmd yet. Just pass. |
| 147 # Add a sleep after the shutdown because sometimes it takes some time for | 146 # Add a sleep after the shutdown because sometimes it takes some time for |
| 148 # the port to be available again. | 147 # the port to be available again. |
| 149 return [self._bash, "-c", self._httpd_cmd_string + ' -k stop && sleep 5'] | 148 return [self._bash, "-c", self._httpd_cmd_string + ' -k stop && sleep 5'] |
| OLD | NEW |