summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xchrome/test/functional/webpagereplay.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/test/functional/webpagereplay.py b/chrome/test/functional/webpagereplay.py
index 919c9fe..c6d3350 100755
--- a/chrome/test/functional/webpagereplay.py
+++ b/chrome/test/functional/webpagereplay.py
@@ -161,9 +161,12 @@ class ReplayServer(object):
"""Stop Web Page Replay."""
if self.replay_process:
logging.debug('Stopping Web-Page-Replay')
- # Use a SIGINT here so that it can do graceful cleanup.
- # Otherwise, we will leave subprocesses hanging.
- self.replay_process.send_signal(signal.SIGINT)
+ # Use a SIGINT so that it can do graceful cleanup. On Windows, we are left
+ # with no other option than terminate().
+ try:
+ self.replay_process.send_signal(signal.SIGINT)
+ except:
+ self.replay_process.terminate()
self.replay_process.wait()
if self.log_fh:
self.log_fh.close()