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

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

Merge "Add adb remount after reboot to ensure push file to real device... 

Merge "Add adb remount after reboot to ensure push file to real device success" am: 608e38df am: 4b99bf87 am: 89ab7f9a am: 758c9ab0

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1819024

Change-Id: I1826126e45210b9f34af29db017587b7e136162b
parents aa804244 758c9ab0

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

+3 −0
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ class GdAndroidDevice(GdDeviceBase): 
                          "syncing them by setting timezone to %s" % (device_tz, host_tz, target_timezone))

            self.adb.shell("setprop persist.sys.timezone %s" % target_timezone)

            self.reboot()

            self.adb.remount()

            device_tz = self.adb.shell("date +%z")

            asserts.assert_equal(

                host_tz, device_tz, "Device timezone %s still does not match host "
@@ -407,6 +408,7 @@ class GdAndroidDevice(GdDeviceBase): 
                    "[%s] Failed to TCP forward host port %d to "

                    "device port %d, num_retries left is %d" % (self.label, host_port, device_port, num_retry))

                self.reboot()

                self.adb.remount()

                return self.tcp_forward_or_die(host_port, device_port, num_retry=num_retry)

            asserts.fail(

                'Unable to forward host port %d to device port %d, error %s' % (host_port, device_port, error_or_port))
@@ -434,6 +436,7 @@ class GdAndroidDevice(GdDeviceBase): 
                    "[%s] Failed to TCP reverse device port %d to "

                    "host port %d, num_retries left is %d" % (self.label, device_port, host_port, num_retry))

                self.reboot()

                self.adb.remount()

                return self.tcp_reverse_or_die(device_port, host_port, num_retry=num_retry)

            asserts.fail(

                'Unable to reverse device port %d to host port %d, error %s' % (device_port, host_port, error_or_port))

system/gd/cert/gd_device.py

+3 −0
Original line number Diff line number Diff line
@@ -388,6 +388,7 @@ class GdAndroidDevice(GdDeviceBase): 
                          "syncing them by setting timezone to %s" % (device_tz, host_tz, target_timezone))

            self.adb.shell("setprop persist.sys.timezone %s" % target_timezone)

            self.reboot()

            self.adb.remount()

            device_tz = self.adb.shell("date +%z")

            asserts.assert_equal(

                host_tz, device_tz, "Device timezone %s still does not match host "
@@ -441,6 +442,7 @@ class GdAndroidDevice(GdDeviceBase): 
                    "[%s] Failed to TCP forward host port %d to "

                    "device port %d, num_retries left is %d" % (self.label, host_port, device_port, num_retry))

                self.reboot()

                self.adb.remount()

                return self.tcp_forward_or_die(host_port, device_port, num_retry=num_retry)

            asserts.fail(

                'Unable to forward host port %d to device port %d, error %s' % (host_port, device_port, error_or_port))
@@ -468,6 +470,7 @@ class GdAndroidDevice(GdDeviceBase): 
                    "[%s] Failed to TCP reverse device port %d to "

                    "host port %d, num_retries left is %d" % (self.label, device_port, host_port, num_retry))

                self.reboot()

                self.adb.remount()

                return self.tcp_reverse_or_die(device_port, host_port, num_retry=num_retry)

            asserts.fail(

                'Unable to reverse device port %d to host port %d, error %s' % (device_port, host_port, error_or_port))