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

Commit 0d48daa3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix call to non-existent method in OOB pairing test" into udc-mainline-prod

parents 11e4f377 9bbc9691
Loading
Loading
Loading
Loading
+30 −3
Original line number Diff line number Diff line
@@ -58,6 +58,33 @@ class OobPairingTest(sl4a_sl4a_base_test.Sl4aSl4aBaseTestClass):

        return address, irk

    def __get_dut_public_address_and_irk_from_bt_config(self):
        # Pull IRK from SL4A dut side
        bt_config_file_path = os.path.join(get_current_context().get_full_output_path(),
                                           "DUT_%s_bt_config.conf" % self.dut.serial)
        try:
            self.dut.adb.pull(["/data/misc/bluedroid/bt_config.conf", bt_config_file_path])
        except AdbError as error:
            logging.error("Failed to pull SL4A dut BT config")
            return False
        logging.debug("Reading SL4A dut BT config")
        with io.open(bt_config_file_path) as f:
            for line in f.readlines():
                stripped_line = line.strip()
                if (stripped_line.startswith("Address")):
                    address_fields = stripped_line.split(' ')
                    # API currently requires public address to be capitalized
                    address = address_fields[2].upper()
                    logging.debug("Found dut address: %s" % address)
                    continue
                if (stripped_line.startswith("LE_LOCAL_KEY_IRK")):
                    irk_fields = stripped_line.split(' ')
                    irk = irk_fields[2]
                    logging.debug("Found dut IRK: %s" % irk)
                    continue

        return address, irk

    def setup_class(self):
        super().setup_class()

@@ -137,10 +164,10 @@ class OobPairingTest(sl4a_sl4a_base_test.Sl4aSl4aBaseTestClass):
        assertThat(oob_data[0]).isEqualTo(0)
        assertThat(oob_data[1]).isNotNone()
        advertiser_address = oob_data[1].to_sl4a_address()
        public_address = self.dut_advertiser_.get_local_public_address()
        dut_public_address, dut_irk = self.__get_dut_public_address_and_irk_from_bt_config()
        logging.info("DUT Advertiser Address: %s " % advertiser_address)
        logging.info("DUT Public Address: %s " % public_address)
        assertThat(advertiser_address).isNotEqualTo(public_address)
        logging.info("DUT Public Address: %s " % dut_public_address)
        assertThat(advertiser_address).isNotEqualTo(dut_public_address)


if __name__ == '__main__':