Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(188)

Side by Side Diff: webrtc/video/end_to_end_tests.cc

Issue 2778973004: Disable flaky test EndToEndTest.InitialProbing (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 #include <algorithm> 10 #include <algorithm>
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #include "webrtc/test/gtest.h" 49 #include "webrtc/test/gtest.h"
50 #include "webrtc/test/gmock.h" 50 #include "webrtc/test/gmock.h"
51 #include "webrtc/test/null_transport.h" 51 #include "webrtc/test/null_transport.h"
52 #include "webrtc/test/rtcp_packet_parser.h" 52 #include "webrtc/test/rtcp_packet_parser.h"
53 #include "webrtc/test/rtp_rtcp_observer.h" 53 #include "webrtc/test/rtp_rtcp_observer.h"
54 #include "webrtc/test/testsupport/fileutils.h" 54 #include "webrtc/test/testsupport/fileutils.h"
55 #include "webrtc/test/testsupport/perf_test.h" 55 #include "webrtc/test/testsupport/perf_test.h"
56 #include "webrtc/video/transport_adapter.h" 56 #include "webrtc/video/transport_adapter.h"
57 #include "webrtc/video_encoder.h" 57 #include "webrtc/video_encoder.h"
58 58
59 #if defined(MEMORY_SANITIZER)
60 // Flaky under MemorySanitizer, see
61 // https://bugs.chromium.org/p/webrtc/issues/detail?id=7419
62 #define MAYBE_InitialProbing DISABLED_InitialProbing
63 #else
64 #define MAYBE_InitialProbing InitialProbing
65 #endif
66
59 namespace webrtc { 67 namespace webrtc {
60 68
61 static const int kSilenceTimeoutMs = 2000; 69 static const int kSilenceTimeoutMs = 2000;
62 70
63 class EndToEndTest : public test::CallTest { 71 class EndToEndTest : public test::CallTest {
64 public: 72 public:
65 EndToEndTest() {} 73 EndToEndTest() {}
66 74
67 virtual ~EndToEndTest() { 75 virtual ~EndToEndTest() {
68 EXPECT_EQ(nullptr, video_send_stream_); 76 EXPECT_EQ(nullptr, video_send_stream_);
(...skipping 2149 matching lines...) Expand 10 before | Expand all | Expand 10 after
2218 sender_call_ = sender_call; 2226 sender_call_ = sender_call;
2219 } 2227 }
2220 2228
2221 protected: 2229 protected:
2222 Clock* const clock_; 2230 Clock* const clock_;
2223 const int start_bitrate_bps_; 2231 const int start_bitrate_bps_;
2224 int state_; 2232 int state_;
2225 Call* sender_call_; 2233 Call* sender_call_;
2226 }; 2234 };
2227 2235
2228 TEST_F(EndToEndTest, InitialProbing) { 2236 TEST_F(EndToEndTest, MAYBE_InitialProbing) {
2229 class InitialProbingTest : public ProbingTest { 2237 class InitialProbingTest : public ProbingTest {
2230 public: 2238 public:
2231 InitialProbingTest() : ProbingTest(300000) {} 2239 InitialProbingTest() : ProbingTest(300000) {}
2232 2240
2233 void PerformTest() override { 2241 void PerformTest() override {
2234 int64_t start_time_ms = clock_->TimeInMilliseconds(); 2242 int64_t start_time_ms = clock_->TimeInMilliseconds();
2235 do { 2243 do {
2236 if (clock_->TimeInMilliseconds() - start_time_ms > kTimeoutMs) { 2244 if (clock_->TimeInMilliseconds() - start_time_ms > kTimeoutMs) {
2237 ADD_FAILURE() << "Timed out while waiting for initial probing."; 2245 ADD_FAILURE() << "Timed out while waiting for initial probing.";
2238 break; 2246 break;
(...skipping 2048 matching lines...) Expand 10 before | Expand all | Expand 10 after
4287 std::unique_ptr<VideoEncoder> encoder_; 4295 std::unique_ptr<VideoEncoder> encoder_;
4288 std::unique_ptr<VideoDecoder> decoder_; 4296 std::unique_ptr<VideoDecoder> decoder_;
4289 rtc::CriticalSection crit_; 4297 rtc::CriticalSection crit_;
4290 int recorded_frames_ GUARDED_BY(crit_); 4298 int recorded_frames_ GUARDED_BY(crit_);
4291 } test(this); 4299 } test(this);
4292 4300
4293 RunBaseTest(&test); 4301 RunBaseTest(&test);
4294 } 4302 }
4295 4303
4296 } // namespace webrtc 4304 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698