mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-20 09:07:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix OperationsChainTest.OnChainEmptyCallback flake.

Browse source 
This test was added in
https://webrtc-review.googlesource.com/c/src/+/180620. On my machine it
passes about 98% of the time.

The test is meant to count the number of times the callback that the
operations chain is empty has been invoked, and does this by ensuring
the last operation to make the chain empty has completed before
expecting that the counter has increased.

The race happns when the operation has completed but the callback that
the chain is empty has not happened yet. This CL fixes that by using
EXPECT_EQ_WAIT instead.

TBR=hta@webrtc.org

Bug: chromium:1060083
Change-Id: I2ebfac3e635ef895d6602f7360e5ec6006fc1d0a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/182541
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31992}
This commit is contained in:
Henrik Boström 2020-08-25 17:11:20 +02:00 committed by Commit Bot
parent 8572841131
commit e8b00a1a74
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
rtc_base/BUILD.gn
View file

@ -1276,6 +1276,7 @@ if (rtc_include_tests) {
sources = [ "operations_chain_unittest.cc" ] sources = [ "operations_chain_unittest.cc" ]
deps = [ deps = [
":gunit_helpers",
":rtc_base", ":rtc_base",
":rtc_base_approved", ":rtc_base_approved",
":rtc_event", ":rtc_event",

15
rtc_base/operations_chain_unittest.cc
View file

@ -18,6 +18,7 @@
#include "rtc_base/bind.h" #include "rtc_base/bind.h"
#include "rtc_base/event.h" #include "rtc_base/event.h"
#include "rtc_base/gunit.h"
#include "rtc_base/thread.h" #include "rtc_base/thread.h"
#include "test/gmock.h" #include "test/gmock.h"
#include "test/gtest.h" #include "test/gtest.h"
@ -26,6 +27,12 @@ namespace rtc {
using ::testing::ElementsAre; using ::testing::ElementsAre;
namespace {
constexpr int kDefaultTimeout = 3000;
} // namespace
class OperationTracker { class OperationTracker {
public: public:
OperationTracker() : background_thread_(Thread::Create()) { OperationTracker() : background_thread_(Thread::Create()) {
@ -409,7 +416,7 @@ TEST(OperationsChainTest, OnChainEmptyCallback) {
// Completing the operation empties the chain, invoking the callback. // Completing the operation empties the chain, invoking the callback.
unblock_async_operation_event0.Set(); unblock_async_operation_event0.Set();
async_operation_completed_event0->Wait(Event::kForever); async_operation_completed_event0->Wait(Event::kForever);
EXPECT_EQ(1u, on_empty_callback_counter); EXPECT_TRUE_WAIT(1u == on_empty_callback_counter, kDefaultTimeout);
// Chain multiple events. // Chain multiple events.
Event unblock_async_operation_event1; Event unblock_async_operation_event1;
@ -421,16 +428,16 @@ TEST(OperationsChainTest, OnChainEmptyCallback) {
operation_tracker_proxy.PostAsynchronousOperation( operation_tracker_proxy.PostAsynchronousOperation(
&unblock_async_operation_event2); &unblock_async_operation_event2);
// Again, the callback is not invoked until the operation has completed. // Again, the callback is not invoked until the operation has completed.
EXPECT_EQ(1u, on_empty_callback_counter); EXPECT_TRUE_WAIT(1u == on_empty_callback_counter, kDefaultTimeout);
// Upon completing the first event, the chain is still not empty, so the // Upon completing the first event, the chain is still not empty, so the
// callback must not be invoked yet. // callback must not be invoked yet.
unblock_async_operation_event1.Set(); unblock_async_operation_event1.Set();
async_operation_completed_event1->Wait(Event::kForever); async_operation_completed_event1->Wait(Event::kForever);
EXPECT_EQ(1u, on_empty_callback_counter); EXPECT_TRUE_WAIT(1u == on_empty_callback_counter, kDefaultTimeout);
// Completing the last evenet empties the chain, invoking the callback. // Completing the last evenet empties the chain, invoking the callback.
unblock_async_operation_event2.Set(); unblock_async_operation_event2.Set();
async_operation_completed_event2->Wait(Event::kForever); async_operation_completed_event2->Wait(Event::kForever);
EXPECT_EQ(2u, on_empty_callback_counter); EXPECT_TRUE_WAIT(2u == on_empty_callback_counter, kDefaultTimeout);
} }
TEST(OperationsChainTest, TEST(OperationsChainTest,