From c4d3e34d3681ee21678dba4e4a6128d33bb61966 Mon Sep 17 00:00:00 2001 From: Bjorn Terelius Date: Thu, 25 Mar 2021 11:44:32 +0100 Subject: [PATCH] Clean up temporary event log file after test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:12084 Change-Id: If17140b6af8f88faf7808645ca8998a5540aad06 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/212963 Commit-Queue: Björn Terelius Reviewed-by: Elad Alon Cr-Commit-Position: refs/heads/master@{#33564} --- logging/rtc_event_log/rtc_event_log_unittest.cc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/logging/rtc_event_log/rtc_event_log_unittest.cc b/logging/rtc_event_log/rtc_event_log_unittest.cc index b6fa1db539..dca7fb7774 100644 --- a/logging/rtc_event_log/rtc_event_log_unittest.cc +++ b/logging/rtc_event_log/rtc_event_log_unittest.cc @@ -899,9 +899,9 @@ TEST_P(RtcEventLogCircularBufferTest, KeepsMostRecentEvents) { auto task_queue_factory = CreateDefaultTaskQueueFactory(); RtcEventLogFactory rtc_event_log_factory(task_queue_factory.get()); - // When log_dumper goes out of scope, it causes the log file to be flushed + // When `log` goes out of scope, it causes the log file to be flushed // to disk. - std::unique_ptr log_dumper = + std::unique_ptr log = rtc_event_log_factory.CreateRtcEventLog(encoding_type_); for (size_t i = 0; i < kNumEvents; i++) { @@ -911,18 +911,18 @@ TEST_P(RtcEventLogCircularBufferTest, KeepsMostRecentEvents) { // simplicity. // We base the various values on the index. We use this for some basic // consistency checks when we read back. - log_dumper->Log(std::make_unique( + log->Log(std::make_unique( i, kStartBitrate + i * 1000)); fake_clock->AdvanceTime(TimeDelta::Millis(10)); } int64_t start_time_us = rtc::TimeMicros(); int64_t utc_start_time_us = rtc::TimeUTCMicros(); - log_dumper->StartLogging( + log->StartLogging( std::make_unique(temp_filename, 10000000), RtcEventLog::kImmediateOutput); fake_clock->AdvanceTime(TimeDelta::Millis(10)); int64_t stop_time_us = rtc::TimeMicros(); - log_dumper->StopLogging(); + log->StopLogging(); // Read the generated file from disk. ParsedRtcEventLog parsed_log; @@ -960,6 +960,9 @@ TEST_P(RtcEventLogCircularBufferTest, KeepsMostRecentEvents) { RtcEventProbeResultSuccess(first_id + i, first_bitrate_bps + i * 1000), probe_success_events[i]); } + + // Clean up temporary file - can be pretty slow. + remove(temp_filename.c_str()); } INSTANTIATE_TEST_SUITE_P(