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

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

Issue 2104583002: Disabling EndToEndTest.RestartingSendStreamPreservesRtpStatesWithRtx. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 5 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 3079 matching lines...) Expand 10 before | Expand all | Expand 10 after
3090 receive_transport.StopSending(); 3090 receive_transport.StopSending();
3091 3091
3092 Stop(); 3092 Stop();
3093 DestroyStreams(); 3093 DestroyStreams();
3094 } 3094 }
3095 3095
3096 TEST_F(EndToEndTest, RestartingSendStreamPreservesRtpState) { 3096 TEST_F(EndToEndTest, RestartingSendStreamPreservesRtpState) {
3097 TestRtpStatePreservation(false); 3097 TestRtpStatePreservation(false);
3098 } 3098 }
3099 3099
3100 #if defined(WEBRTC_MAC) 3100 // This test is flaky. See:
3101 #define MAYBE_RestartingSendStreamPreservesRtpStatesWithRtx \ 3101 // https://bugs.chromium.org/p/webrtc/issues/detail?id=4332
3102 DISABLED_RestartingSendStreamPreservesRtpStatesWithRtx 3102 TEST_F(EndToEndTest, DISABLED_RestartingSendStreamPreservesRtpStatesWithRtx) {
3103 #else
3104 #define MAYBE_RestartingSendStreamPreservesRtpStatesWithRtx \
3105 RestartingSendStreamPreservesRtpStatesWithRtx
3106 #endif
3107 TEST_F(EndToEndTest, MAYBE_RestartingSendStreamPreservesRtpStatesWithRtx) {
3108 TestRtpStatePreservation(true); 3103 TestRtpStatePreservation(true);
3109 } 3104 }
3110 3105
3111 TEST_F(EndToEndTest, RespectsNetworkState) { 3106 TEST_F(EndToEndTest, RespectsNetworkState) {
3112 // TODO(pbos): Remove accepted downtime packets etc. when signaling network 3107 // TODO(pbos): Remove accepted downtime packets etc. when signaling network
3113 // down blocks until no more packets will be sent. 3108 // down blocks until no more packets will be sent.
3114 3109
3115 // Pacer will send from its packet list and then send required padding before 3110 // Pacer will send from its packet list and then send required padding before
3116 // checking paused_ again. This should be enough for one round of pacing, 3111 // checking paused_ again. This should be enough for one round of pacing,
3117 // otherwise increase. 3112 // otherwise increase.
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
3557 private: 3552 private:
3558 bool video_observed_; 3553 bool video_observed_;
3559 bool audio_observed_; 3554 bool audio_observed_;
3560 SequenceNumberUnwrapper unwrapper_; 3555 SequenceNumberUnwrapper unwrapper_;
3561 std::set<int64_t> received_packet_ids_; 3556 std::set<int64_t> received_packet_ids_;
3562 } test; 3557 } test;
3563 3558
3564 RunBaseTest(&test); 3559 RunBaseTest(&test);
3565 } 3560 }
3566 } // namespace webrtc 3561 } // 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