From f08dd9db3418f5ed5f33cd80e4df7a96abde9620 Mon Sep 17 00:00:00 2001 From: Ilya Nikolaevskiy Date: Tue, 9 Oct 2018 17:22:15 +0200 Subject: [PATCH] Disable flaky tests on mac perf bot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:9840 Change-Id: Ie95fdb7bc698604a85ad56242ba092c36a99002e Reviewed-on: https://webrtc-review.googlesource.com/c/104801 Reviewed-by: Erik Språng Commit-Queue: Ilya Nikolaevskiy Cr-Commit-Position: refs/heads/master@{#25080} --- video/full_stack_tests.cc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/video/full_stack_tests.cc b/video/full_stack_tests.cc index e4a7a6772d..21a8e621bc 100644 --- a/video/full_stack_tests.cc +++ b/video/full_stack_tests.cc @@ -47,8 +47,6 @@ namespace webrtc { namespace { static const int kFullStackTestDurationSecs = 45; -const char kScreenshareSimulcastExperiment[] = - "WebRTC-SimulcastScreenshare/Enabled/"; const char kPacerPushBackExperiment[] = "WebRTC-PacerPushbackExperiment/Enabled/"; @@ -642,6 +640,11 @@ TEST(FullStackTest, ScreenshareSlidesVP8_2TL) { fixture->RunWithAnalyzer(screenshare); } +// TODO(bugs.webrtc.org/9840): Investigate why is this test flaky on MAC. +#if !defined(WEBRTC_MAC) +const char kScreenshareSimulcastExperiment[] = + "WebRTC-SimulcastScreenshare/Enabled/"; + TEST(FullStackTest, ScreenshareSlidesVP8_3TL_Simulcast) { auto fixture = CreateVideoQualityTestFixture(); test::ScopedFieldTrials field_trial(kScreenshareSimulcastExperiment); @@ -670,6 +673,7 @@ TEST(FullStackTest, ScreenshareSlidesVP8_3TL_Simulcast) { false}; fixture->RunWithAnalyzer(screenshare); } +#endif // !defined(WEBRTC_MAC) TEST(FullStackTest, ScreenshareSlidesVP8_2TL_Scroll) { auto fixture = CreateVideoQualityTestFixture(); @@ -1104,7 +1108,8 @@ INSTANTIATE_TEST_CASE_P(FullStackTest, class DualStreamsTest : public ::testing::TestWithParam {}; // Disable dual video test on mobile device becuase it's too heavy. -#if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_IOS) +// TODO(bugs.webrtc.org/9840): Investigate why is this test flaky on MAC. +#if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_IOS) && !defined(WEBRTC_MAC) TEST_P(DualStreamsTest, ModeratelyRestricted_SlidesVp8_3TL_Simulcast_Video_Simulcast_High) { test::ScopedFieldTrials field_trial( @@ -1168,7 +1173,8 @@ TEST_P(DualStreamsTest, auto fixture = CreateVideoQualityTestFixture(); fixture->RunWithAnalyzer(dual_streams); } -#endif // !defined(WEBRTC_ANDROID) && !defined(WEBRTC_IOS) +#endif // !defined(WEBRTC_ANDROID) && !defined(WEBRTC_IOS) && + // !defined(WEBRTC_MAC) TEST_P(DualStreamsTest, Conference_Restricted) { test::ScopedFieldTrials field_trial(