From 7e5203f1518db3dde733f5b76f1af9fc09d7b114 Mon Sep 17 00:00:00 2001 From: Ilya Nikolaevskiy Date: Mon, 10 Sep 2018 12:04:50 +0000 Subject: [PATCH] Revert "Reenable simulcast video full stack test on MAC" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2c446f2723451011f8c3ec5d240337e9e309a577. Reason for revert: Still hangs, e.g. here: https://ci.chromium.org/buildbot/client.webrtc.perf/Mac%2010.11/7204 Original change's description: > Reenable simulcast video full stack test on MAC > > Reenabling test because a possible hanging cause was fixed here: > https://webrtc-review.googlesource.com/c/src/+/96980 > > Bug: webrtc:9220 > Change-Id: I74243eeebe5646c54373fba04bff27d456df7771 > Reviewed-on: https://webrtc-review.googlesource.com/98500 > Reviewed-by: Erik Språng > Commit-Queue: Ilya Nikolaevskiy > Cr-Commit-Position: refs/heads/master@{#24624} TBR=ilnik@webrtc.org,sprang@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:9220 Change-Id: I172ecec57233131267e38b0221564e6f3f88941f Reviewed-on: https://webrtc-review.googlesource.com/99180 Commit-Queue: Ilya Nikolaevskiy Reviewed-by: Ilya Nikolaevskiy Cr-Commit-Position: refs/heads/master@{#24653} --- video/full_stack_tests.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/video/full_stack_tests.cc b/video/full_stack_tests.cc index 804d9f11d7..a27f0f6f5e 100644 --- a/video/full_stack_tests.cc +++ b/video/full_stack_tests.cc @@ -863,7 +863,8 @@ TEST(FullStackTest, VP9KSVC_3SL_Medium_Network_Restricted) { #endif // !defined(RTC_DISABLE_VP9) // Android bots can't handle FullHD, so disable the test. -#if defined(WEBRTC_ANDROID) +// TODO(bugs.webrtc.org/9220): Investigate source of flakiness on Mac. +#if defined(WEBRTC_ANDROID) || defined(WEBRTC_MAC) #define MAYBE_SimulcastFullHdOveruse DISABLED_SimulcastFullHdOveruse #else #define MAYBE_SimulcastFullHdOveruse SimulcastFullHdOveruse