[telemetry] Removing flake in wpr_server.py caused by static port assignment from chrome/test/funct…

tools/telemetry/telemetry/wpr_server.py

Index: tools/telemetry/telemetry/wpr_server.py
diff --git a/tools/telemetry/telemetry/wpr_server.py b/tools/telemetry/telemetry/wpr_server.py
index ec8dd051c737006e55d1f7339b37848510805746..a4203f4a69bfd9a8de0d9ac9d46467770a7d05a5 100644
--- a/tools/telemetry/telemetry/wpr_server.py
+++ b/tools/telemetry/telemetry/wpr_server.py
@@ -15,17 +15,16 @@ import webpagereplay  # pylint: disable=F0401
 CHROME_FLAGS = webpagereplay.CHROME_FLAGS
 
 class ReplayServer(object):
-  def __init__(self, browser_backend, path, is_record_mode):
+  def __init__(self, browser_backend, path, is_record_mode, http_port=None,
+               https_port=None):
     self._browser_backend = browser_backend
     self._forwarder = None
     self._web_page_replay = None
     self._is_record_mode = is_record_mode
 
-    # Note: This can cause flake if server doesn't shut down properly and keeps
-    # ports tied up. See crbug.com/157459.
     self._forwarder = browser_backend.CreateForwarder(
-        (webpagereplay.HTTP_PORT, webpagereplay.HTTP_PORT),
-        (webpagereplay.HTTPS_PORT, webpagereplay.HTTPS_PORT))
+        (http_port or webpagereplay.HTTP_PORT, webpagereplay.HTTP_PORT),
+        (https_port or webpagereplay.HTTPS_PORT, webpagereplay.HTTPS_PORT))

[tonyg, 2012/12/11 16:55:14]

Can you explain the motivation for "http_port or". I don't get why we don't
always use the now randomly picked webpagereplay.HTTP_PORT.

[hartmanng, 2012/12/11 17:14:26]

The webpagereplay.HTTP_PORT is chosen to be an open local port. If we're doing a
test on cros, it isn't guaranteed that webpagereplay.HTTP_PORT is also free on
the remote device. So what I was doing in this patch is getting separate ports
for the device-side of the connection in cros_browser_backend.py and passing
them in to override webpagereplay.HTTP_PORT.

 
     options = []
     if self._is_record_mode: