Reland of "[telemetry] Wire TsProxy through telemetry's network stack."

telemetry/telemetry/internal/forwarders/cros_forwarder_unittest.py

Index: telemetry/telemetry/internal/forwarders/cros_forwarder_unittest.py
diff --git a/telemetry/telemetry/internal/forwarders/cros_forwarder_unittest.py b/telemetry/telemetry/internal/forwarders/cros_forwarder_unittest.py
index 809b63e0bee6f24fd804aa45b6f836a0954c6588..5689296f467cc105533f11f5a58c47a6e61bdaab 100644
--- a/telemetry/telemetry/internal/forwarders/cros_forwarder_unittest.py
+++ b/telemetry/telemetry/internal/forwarders/cros_forwarder_unittest.py
@@ -9,16 +9,23 @@
 
 # pylint: disable=protected-access
 class ForwardingArgsTest(unittest.TestCase):
-  port_pair = forwarders.PortPair(111, 222)
+  port_pairs = forwarders.PortPairs(
+      http=forwarders.PortPair(111, 222),
+      https=forwarders.PortPair(333, 444),
+      dns=None)
 
   def testForwardingArgsReverse(self):
     forwarding_args = cros_forwarder.CrOsSshForwarder._ForwardingArgs(
         use_remote_port_forwarding=True, host_ip='5.5.5.5',
-        port_pair=self.port_pair)
-    self.assertEqual(['-R222:5.5.5.5:111'], forwarding_args)
+        port_pairs=self.port_pairs)
+    self.assertEqual(
+        ['-R222:5.5.5.5:111', '-R444:5.5.5.5:333'],
+        forwarding_args)
 
   def testForwardingArgs(self):
     forwarding_args = cros_forwarder.CrOsSshForwarder._ForwardingArgs(
         use_remote_port_forwarding=False, host_ip='2.2.2.2',
-        port_pair=self.port_pair)
-    self.assertEqual(['-L111:2.2.2.2:222'], forwarding_args)
+        port_pairs=self.port_pairs)
+    self.assertEqual(
+        ['-L111:2.2.2.2:222', '-L333:2.2.2.2:444'],
+        forwarding_args)