commit 543457ed32c18b4e6e5933fea1a031b0e51e6f40
author herbertxue <herbertxue@google.com> Mon Mar 18 18:13:34 2019 +0800
committer herbertxue <herbertxue@google.com> Wed May 08 15:12:48 2019 +0800
tree c6d3b6ac3c13d8ddeed2047b31f8cbee7a223160
parent d92ca49e412d777bddaa6f931d17322846aa3a81

Refactor codes of the definition of ForwardedPorts

Bug: 122929848
Bug: 127394991
Test: m acloud && atest acloud_test && acloud list && acloud reconnect
Change-Id: I5ca1383843827661708cb7441ea24f0588c0e2ab

list/instance_test.py

diff --git a/list/instance_test.py b/list/instance_test.py
index e0f4ffd..e29994b 100644
--- a/list/instance_test.py
+++ b/list/instance_test.py
@@ -57,7 +57,7 @@
         self.assertEqual("1080x1920 (480)", local_instance.display)
         self.assertEqual("Sat Nov 10 21:55:10 2018", local_instance.createtime)
         expected_full_name = "device serial: 127.0.0.1:%s (%s) elapsed time: %s" % (
-            constants.DEFAULT_ADB_PORT, constants.LOCAL_INS_NAME, "fake_time")
+            constants.CF_ADB_PORT, constants.LOCAL_INS_NAME, "fake_time")
         self.assertEqual(expected_full_name, local_instance.fullname)
 
         # test return None if no launch_cvd process found
@@ -95,7 +95,7 @@
         self.Patch(instance, "_GetElapsedTime", return_value="fake_time")
         forwarded_ports = instance.RemoteInstance(
             mock.MagicMock()).GetAdbVncPortFromSSHTunnel(
-                "fake_ip", "fake_avd_type")
+                "fake_ip", constants.TYPE_CF)
         self.assertEqual(54321, forwarded_ports.adb_port)
         self.assertEqual(12345, forwarded_ports.vnc_port)