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

Commit 2c4fbe7f authored by Jizheng Chu's avatar Jizheng Chu
Browse files

Fix Mobly adb pull error when pull logs from device 

Bug: 204462863
Test: Build artifact and run Blueberry GD Cert tests in venv with Mobly installed, see detail steps in go/port-gd-cert
Change-Id: Idd6c87fbddde2c2562a357c65b6cc5885b54aff2
parent 7c489a83

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):