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

Commit 9b92cff4 authored by David Duarte's avatar David Duarte Committed by Cherrypicker Worker
Browse files

QueueTest: Only set promise value when the key is removed 

Setting the promise before removing the value was making some tests
flaky because they assumed that the value was removed when the promise
returned which happened most of the time until it didn't

Bug: 264500085
Test: bluetooth_test_gd_unit64 --gtest_filter=QueueTest.* --gtest_repeat=-1
Change-Id: I951e21b78d971966a40d3c53aa1c26caa532f0df
(cherry picked from commit e18eb241)
Merged-In: I951e21b78d971966a40d3c53aa1c26caa532f0df
parent e038cd6a

system/gd/os/linux_generic/queue_unittest.cc

+9 −8
Original line number Diff line number Diff line
@@ -96,11 +96,12 @@ class TestEnqueueEnd { 
      queue_->UnregisterEnqueue();

    }



    auto pair = promise_map_->find(buffer_.size());

    if (pair != promise_map_->end()) {

      pair->second.set_value(pair->first);

      promise_map_->erase(pair->first);

    auto key = buffer_.size();

    auto node = promise_map_->extract(key);

    if (node) {

      node.mapped().set_value(key);

    }



    return data;

  }
@@ -161,10 +162,10 @@ class TestDequeueEnd { 
      queue_->UnregisterDequeue();

    }



    auto pair = promise_map_->find(buffer_.size());

    if (pair != promise_map_->end()) {

      pair->second.set_value(pair->first);

      promise_map_->erase(pair->first);

    auto key = buffer_.size();

    auto node = promise_map_->extract(key);

    if (node) {

      node.mapped().set_value(key);

    }

  }