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

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

Merge "Fix type difference between host timezone and device timezone in gd... 

Merge "Fix type difference between host timezone and device timezone in gd device setup" am: 6e28b710

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



Change-Id: Ia385684f04fdbfe51af7bea9147e55709a8ff9cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3753b672 6e28b710

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

+1 −1
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ class GdAndroidDevice(GdDeviceBase): 
            self.adb.shell("setprop persist.sys.timezone %s" % target_timezone)

            self.reboot()

            self.adb.remount()

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

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

            asserts.assert_equal(

                host_tz, device_tz, "Device timezone %s still does not match host "

                "timezone %s after reset" % (device_tz, host_tz))