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

Commit b9201ebc authored by Qasim Javed's avatar Qasim Javed Committed by Automerger Merge Worker
Browse files

Merge "Fix three flaky tests." am: 40b9c3a2 

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



Change-Id: I8bcab2a4005fdf1279ec60dba273f8919c1838a5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f9c0db9a 40b9c3a2

system/gd/hci/hci_layer_unittest.cc

+6 −6
Original line number Diff line number Diff line
@@ -257,14 +257,14 @@ TEST_F(HciLayerTest, successful_reset) { 
}



TEST_F(HciLayerTest, abort_if_reset_complete_returns_error) {

  FailIfResetNotSent();

  ASSERT_DEATH(

      {

        FailIfResetNotSent();

        auto error_code = ErrorCode::UNSPECIFIED_ERROR;

        hal_->InjectResetCompleteEventWithCode(error_code);

        std::promise<void> promise;

        auto buf = std::make_unique<char[]>(kBufSize);

        std::snprintf(buf.get(), kBufSize, "Reset completed with status: %s", ErrorCodeText(error_code).c_str());

        std::promise<void> promise;

        log_capture_->WaitUntilLogContains(&promise, buf.get());

      },

      "");
@@ -306,9 +306,9 @@ TEST_F(HciLayerTest, le_event_handler_is_invoked) { 
}



TEST_F(HciLayerTest, abort_on_second_register_event_handler) {

  FailIfResetNotSent();

  ASSERT_DEATH(

      {

        FailIfResetNotSent();

        hci_->RegisterEventHandler(EventCode::COMMAND_COMPLETE, hci_handler_->Bind([](EventView view) {}));

        std::promise<void> promise;

        log_capture_->WaitUntilLogContains(&promise, "Can not register a second handler for");
@@ -317,11 +317,11 @@ TEST_F(HciLayerTest, abort_on_second_register_event_handler) { 
}



TEST_F(HciLayerTest, abort_on_second_register_le_event_handler) {

  ASSERT_DEATH(

      {

        FailIfResetNotSent();

        hci_->RegisterLeEventHandler(

            SubeventCode::ENHANCED_CONNECTION_COMPLETE, hci_handler_->Bind([](LeMetaEventView view) {}));

  ASSERT_DEATH(

      {

        hci_->RegisterLeEventHandler(

            SubeventCode::ENHANCED_CONNECTION_COMPLETE, hci_handler_->Bind([](LeMetaEventView view) {}));

        std::promise<void> promise;