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

Commit 6f75265a authored by Duo Ho's avatar Duo Ho Committed by Automerger Merge Worker
Browse files

Avatar: Fix flaky test in "test_music_stop_dual_device" test case am: c229f923 

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



Change-Id: I88101aef87f278b8bf72db83517cde5625bccb17
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6bac984d c229f923

android/pandora/test/asha_test.py

+16 −7
Original line number Diff line number Diff line
@@ -1095,17 +1095,26 @@ class AshaTest(base_test.BaseTestClass): # type: ignore[misc] 
        ref_left_asha = AioAsha(self.ref_left.aio.channel)

        ref_right_asha = AioAsha(self.ref_right.aio.channel)



        stop_future = self.get_stop_future(self.ref_left)

        await asyncio.gather(

            dut_asha.WaitPeripheral(connection=dut_ref_left), dut_asha.WaitPeripheral(connection=dut_ref_right)

        )

        await dut_asha.Start(connection=dut_ref_left)



        await dut_asha.WaitPeripheral(connection=dut_ref_left)

        await dut_asha.WaitPeripheral(connection=dut_ref_right)

        # Stop audio and wait until ref_device connections stopped.

        stop_future_left = self.get_stop_future(self.ref_left)

        stop_future_right = self.get_stop_future(self.ref_right)



        await dut_asha.Start(connection=dut_ref_left)

        logging.info("send stop")

        _, stop_result = await asyncio.gather(dut_asha.Stop(), asyncio.wait_for(stop_future, timeout=10.0))

        _, stop_result_left, stop_result_right = await asyncio.gather(

            dut_asha.Stop(),

            asyncio.wait_for(stop_future_left, timeout=10.0),

            asyncio.wait_for(stop_future_right, timeout=10.0),

        )



        logging.info(f"stop_result:{stop_result}")

        assert_is_not_none(stop_result)

        logging.info(f"stop_result_left:{stop_result_left}")

        logging.info(f"stop_result_right:{stop_result_right}")

        assert_is_not_none(stop_result_left)

        assert_is_not_none(stop_result_right)



        (audio_data_left, audio_data_right) = await asyncio.gather(

            self.get_audio_data(ref_asha=ref_left_asha, connection=ref_left_dut, timeout=10),