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

tools/telemetry/telemetry/cros_interface_unittest.py

 # Copyright (c) 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.
 
 # TODO(nduca): Rewrite what some of these tests to use mocks instead of
 # actually talking to the device. This would improve our coverage quite
 # a bit.
 import unittest
 import socket
 
 from telemetry import cros_browser_backend
 from telemetry import cros_interface
 from telemetry import options_for_unittests
 from telemetry import run_tests
+from telemetry import util
 
 class CrOSInterfaceTest(unittest.TestCase):
   @run_tests.RequiresBrowserOfType('cros-chrome')
   def testDeviceSideProcessFailureToLaunch(self):
     remote = options_for_unittests.GetCopy().cros_remote
     cri = cros_interface.CrOSInterface(
       remote,
       options_for_unittests.GetCopy().cros_ssh_identity)
 
     def WillFail():
@@ skipping 98 matching lines @@
     sock.bind(('', 0))
     port = sock.getsockname()[1]
     sock.listen(0)
 
     # Get remote port and ensure that it was unused.
     remote_port = cri.GetRemotePort()
     self.assertFalse(cri.IsHTTPServerRunningOnPort(remote_port))
 
     # Forward local server's port to remote device's remote_port.
     forwarder = cros_browser_backend.SSHForwarder(
-        cri, 'R', (remote_port, port))
+        cri, 'R', util.PortPair(port, remote_port))
 
     # At this point, remote device should be able to connect to local server.
     self.assertTrue(cri.IsHTTPServerRunningOnPort(remote_port))
 
     # Next remote port shouldn't be the same as remote_port, since remote_port
     # is now in use.
     self.assertTrue(cri.GetRemotePort() != remote_port)
 
     # Close forwarder and local server ports.
     forwarder.Close()
     sock.close()
 
     # Device should no longer be able to connect to remote_port since it is no
     # longer in use.
     self.assertFalse(cri.IsHTTPServerRunningOnPort(remote_port))
+
+  @run_tests.RequiresBrowserOfType('cros-chrome')
+  def testGetRemotePortReservedPorts(self):
+    remote = options_for_unittests.GetCopy().cros_remote
+    cri = cros_interface.CrOSInterface(
+      remote,
+      options_for_unittests.GetCopy().cros_ssh_identity)
+
+    # Should return 2 separate ports even though the first one isn't technically
+    # being used yet.
+    remote_port_1 = cri.GetRemotePort()
+    remote_port_2 = cri.GetRemotePort()
+
+    self.assertTrue(remote_port_1 != remote_port_2)