Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be3e944e authored by Jizheng Chu's avatar Jizheng Chu Committed by Automerger Merge Worker
Browse files

make ports available on host before port forwarding am: 49f7ef61 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2074359



Change-Id: I5ca3e6849cc24f0b547af3dcfd04453289f674e0
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1a9df7ac 49f7ef61

system/blueberry/tests/gd/cert/adb.py

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import logging 
import shlex

import shutil



from mobly.controllers.android_device_lib.adb import AdbError

from mobly.controllers.android_device_lib.adb import AdbProxy



ROOT_USER_ID = '0'

system/blueberry/tests/gd/cert/gd_device.py

+4 −0
Original line number Diff line number Diff line
@@ -478,6 +478,10 @@ class GdAndroidDevice(GdDeviceBase): 
        logging.info("Confirmed that verity is disabled on device %s %s" % (self.label, self.serial_number))



        # Try freeing ports and ignore results

        asserts.assert_true(

            make_ports_available((self.grpc_port, self.grpc_root_server_port, self.signal_port)),

            "[%s] Failed to make backing process ports available" % self.label

        )

        self.cleanup_port_forwarding()

        self.sync_device_time()

        logging.info("Ports cleaned up and clock is set for device %s %s" % (self.label, self.serial_number))