From 3b205da7e48214eb169be5c5aeef3d1efd4000d6 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Tue, 9 Aug 2022 08:24:17 +0000 Subject: [PATCH] Increase precision of SimulatedTaskQueue (from ms to us). Bug: b/239155933 Change-Id: I1b90a969b9f781fe2902aa822020590683a04b7d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/270923 Reviewed-by: Artem Titov Reviewed-by: Victor Boivie Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#37719} --- net/dcsctp/socket/dcsctp_socket_network_test.cc | 4 +--- test/time_controller/simulated_task_queue.cc | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/net/dcsctp/socket/dcsctp_socket_network_test.cc b/net/dcsctp/socket/dcsctp_socket_network_test.cc index a741f79f6c..a804a851e9 100644 --- a/net/dcsctp/socket/dcsctp_socket_network_test.cc +++ b/net/dcsctp/socket/dcsctp_socket_network_test.cc @@ -292,8 +292,6 @@ class SctpActor : public rtc::MessageHandlerAutoCleanup, double avg_received_bitrate_mbps(size_t remove_first_n = 3) const { std::vector bitrates = received_bitrate_mbps_; bitrates.erase(bitrates.begin(), bitrates.begin() + remove_first_n); - // The last entry isn't full - remove it as well. - bitrates.pop_back(); double sum = 0; for (double bitrate : bitrates) { @@ -518,7 +516,7 @@ TEST_F(DcSctpSocketNetworkTest, DCSCTP_NDEBUG_TEST(HasHighBandwidth)) { // Verify that the bitrate is in the range of 540-640 Mbps double bitrate = receiver.avg_received_bitrate_mbps(); - EXPECT_THAT(bitrate, AllOf(Ge(540), Le(640))); + EXPECT_THAT(bitrate, AllOf(Ge(520), Le(640))); } } // namespace } // namespace dcsctp diff --git a/test/time_controller/simulated_task_queue.cc b/test/time_controller/simulated_task_queue.cc index 8b04442f6b..3c26721845 100644 --- a/test/time_controller/simulated_task_queue.cc +++ b/test/time_controller/simulated_task_queue.cc @@ -81,10 +81,7 @@ void SimulatedTaskQueue::PostDelayedHighPrecisionTask( absl::AnyInvocable task, TimeDelta delay) { MutexLock lock(&lock_); - // Some tests start to fail when precision of this simulated task queue is - // changed, thus delay is rounded to milliseconds. - Timestamp target_time = - handler_->CurrentTime() + TimeDelta::Millis(delay.ms()); + Timestamp target_time = handler_->CurrentTime() + delay; delayed_tasks_[target_time].push_back(std::move(task)); next_run_time_ = std::min(next_run_time_, target_time); }