aboutsummaryrefslogtreecommitdiff
path: root/blueberry
diff options
context:
space:
mode:
authorJizheng Chu <jizhengchu@google.com>2021-09-02 16:03:45 -0700
committerJizheng Chu <jizhengchu@google.com>2021-09-02 16:03:45 -0700
commit5572c48ea718e1c24ac0c4b5366040f06801c31d (patch)
tree8de9303f053c4d0cd2ecfd51f80a104668b79e9b /blueberry
parent079c15d0db5feb5f256781299a02ef85d3dff9b4 (diff)
downloadbt-5572c48ea718e1c24ac0c4b5366040f06801c31d.tar.gz
Set up ports after verity check for real device setup
In case of using freshly flashed devices, a reboot is trigged in ensure_verity_disabled, port forward and reverse should be setup after the reboot to ensure backing process start success. Bug: 196088041 Test: gd/cert/run Change-Id: I07e9a7a3a64ee6b44aca1b1b4cde2074661532e3
Diffstat (limited to 'blueberry')
-rw-r--r--blueberry/tests/gd/cert/gd_device.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/blueberry/tests/gd/cert/gd_device.py b/blueberry/tests/gd/cert/gd_device.py
index 79762a7e7..186eb1bc5 100644
--- a/blueberry/tests/gd/cert/gd_device.py
+++ b/blueberry/tests/gd/cert/gd_device.py
@@ -226,6 +226,7 @@ class GdAndroidDevice(GdDeviceBase):
def setup(self):
logging.info("Setting up device %s %s" % (self.label, self.serial_number))
asserts.assert_true(self.adb.ensure_root(), "device %s cannot run as root", self.serial_number)
+ self.ensure_verity_disabled()
# Try freeing ports and ignore results
self.cleanup_port_forwarding()
@@ -237,7 +238,6 @@ class GdAndroidDevice(GdDeviceBase):
self.tcp_reverse_or_die(self.signal_port, self.signal_port)
# Push test binaries
- self.ensure_verity_disabled()
self.push_or_die(os.path.join(get_gd_root(), "target", "bluetooth_stack_with_facade"), "system/bin")
self.push_or_die(
os.path.join(get_gd_root(), "target", "android.system.suspend.control-V1-ndk.so"), "system/lib64")