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

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

Merge "Fix Mobly adb pull error when pull logs from device" am: 13f3943d am: c8e5971e 

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

Change-Id: Ie00e99e55d71561a3106b0dc7b80ea4959c65092
parents ad1b43a4 c8e5971e

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

+12 −6
Original line number Diff line number Diff line
@@ -319,22 +319,28 @@ class GdAndroidDevice(GdDeviceBase): 
        self.logcat_logger.stop()

        self.cleanup_port_forwarding()

        try:

            self.adb.pull("/data/misc/bluetooth/logs/btsnoop_hci.log %s" % os.path.join(

                self.log_path_base, "%s_btsnoop_hci.log" % self.label))

            self.adb.pull([

                "/data/misc/bluetooth/logs/btsnoop_hci.log",

                str(os.path.join(self.log_path_base, "%s_btsnoop_hci.log" % self.label))

            ])

        except AdbError as error:

            # Some tests have no snoop logs, and that's OK

            if ADB_FILE_NOT_EXIST_ERROR not in str(error):

                logging.error(PULL_LOG_FILE_ERROR_MSG_PREFIX + str(error))

        try:

            self.adb.pull("/data/misc/bluedroid/bt_config.conf %s" % os.path.join(self.log_path_base,

                                                                                  "%s_bt_config.conf" % self.label))

            self.adb.pull([

                "/data/misc/bluedroid/bt_config.conf",

                str(os.path.join(self.log_path_base, "%s_bt_config.conf" % self.label))

            ])

        except AdbError as error:

            # Some tests have no config file, and that's OK

            if ADB_FILE_NOT_EXIST_ERROR not in str(error):

                logging.error(PULL_LOG_FILE_ERROR_MSG_PREFIX + str(error))

        try:

            self.adb.pull("/data/misc/bluedroid/bt_config.bak %s" % os.path.join(self.log_path_base,

                                                                                 "%s_bt_config.bak" % self.label))

            self.adb.pull([

                "/data/misc/bluedroid/bt_config.bak",

                str(os.path.join(self.log_path_base, "%s_bt_config.bak" % self.label))

            ])

        except AdbError as error:

            # Some tests have no config.bak file, and that's OK

            if ADB_FILE_NOT_EXIST_ERROR not in str(error):