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

Commit 7f1969e1 authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Automerger Merge Worker
Browse files

Merge "Adding area members to the pairing tests" into main am: 7aacb0a3 

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



Change-Id: If2be87e715109dfa2f3e2a29652fd3d59c5c1772
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3ed30c29 7aacb0a3

android/pandora/test/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ python_test_host { 
    name: "avatar",

    main: "main.py",

    srcs: [

        "*.py",

        "**/*.py",

    ],

    libs: [

        "bumble_services_experimental-python",

android/pandora/test/main.py

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import avatar.cases.security_test 
import gatt_test

import hfpclient_test

import sdp_test

import smp_test

import pairing.smp_test as smp_test



_TEST_CLASSES_LIST = [

    avatar.cases.host_test.HostTest,

android/pandora/test/pairing/OWNERS

0 → 100644
+2 −0
Original line number Diff line number Diff line 
# Bug component: 27441

rwt@google.com

android/pandora/test/smp_test.py→android/pandora/test/pairing/smp_test.py

+9 −12
Original line number Diff line number Diff line
@@ -75,20 +75,16 @@ class SmpTest(base_test.BaseTestClass): # type: ignore[misc] 
                    )

                    ref_pairing_stream.send_nowait(ref_ev_answer)

                else:

                    dut_pairing_stream.send_nowait(

                        PairingEventAnswer(

                    dut_pairing_stream.send_nowait(PairingEventAnswer(

                        event=dut_pairing_event,

                        confirm=True,

                        )

                    )

                    ))

                    ref_pairing_event = await anext(ref_pairing_stream)



                    ref_pairing_stream.send_nowait(

                        PairingEventAnswer(

                    ref_pairing_stream.send_nowait(PairingEventAnswer(

                        event=ref_pairing_event,

                        confirm=True,

                        )

                    )

                    ))



        finally:

            dut_pairing_stream.cancel()
@@ -251,6 +247,7 @@ class SmpTest(base_test.BaseTestClass): # type: ignore[misc] 
        fut = asyncio.get_running_loop().create_future()



        class Session(smp.Session):



            def on_smp_pairing_request_command(self, command: smp.SMP_Pairing_Request_Command) -> None:

                nonlocal fut

                fut.set_result(False)

framework/tests/bumble/src/android/bluetooth/pairing/OWNERS

0 → 100644
+3 −0
Original line number Diff line number Diff line 
# Bug component: 27441

# Project owners

rwt@google.com