[polymer] Merge of master into polymer10-migration

telemetry/telemetry/internal/util/webpagereplay.py

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Start and stop Web Page Replay."""
 
 from telemetry.internal.util import atexit_with_log
 import logging
 import os
 import re
@@ skipping 131 matching lines @@
     if self.replay_process.poll() is not None:
       # The process terminated.
       return False
 
     def HasIncompleteStartedPorts():
       return ('http' not in self._started_ports or
               'https' not in self._started_ports or
               (self._use_dns_server and 'dns' not in self._started_ports))
     if HasIncompleteStartedPorts():
       self._started_ports = self._ParseLogFilePorts(self._LogLines())
+      logging.info('WPR ports: %s' % self._started_ports)
     if HasIncompleteStartedPorts():
       return False
     try:
       # HTTPS may require SNI (which urllib does not speak), so only check
       # that HTTP responds.
       return 200 == self._UrlOpen('web-page-replay-generate-200').getcode()
     except IOError:
       return False
 
   @staticmethod
@@ skipping 157 matching lines @@
   On posix system, running this function before starting replay fixes a
   bug that shows up when Telemetry is run as a background command from a
   script. https://crbug.com/254572.
 
   Background: Signal masks on Linux are inherited from parent
   processes. If anything invoking us accidentally masks SIGINT
   (e.g. by putting a process in the background from a shell script),
   sending a SIGINT to the child will fail to terminate it.
   """
   signal.signal(signal.SIGINT, signal.SIG_DFL)