From 46711db355f9b017f774c0c80f61c704eb36769a Mon Sep 17 00:00:00 2001 From: kthelgason Date: Tue, 13 Dec 2016 05:31:13 -0800 Subject: [PATCH] Disable flaky QualityScaler tests for now. BUG=webrtc:6799 TBR=sprang@webrtc.org Review-Url: https://codereview.webrtc.org/2564423002 Cr-Commit-Position: refs/heads/master@{#15573} --- .../utility/quality_scaler_unittest.cc | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/webrtc/modules/video_coding/utility/quality_scaler_unittest.cc b/webrtc/modules/video_coding/utility/quality_scaler_unittest.cc index 06d26d8d4f..ada0e98ef9 100644 --- a/webrtc/modules/video_coding/utility/quality_scaler_unittest.cc +++ b/webrtc/modules/video_coding/utility/quality_scaler_unittest.cc @@ -108,27 +108,28 @@ class QualityScalerTest : public ::testing::Test { std::unique_ptr observer_; }; -TEST_F(QualityScalerTest, DownscalesAfterContinuousFramedrop) { +#define DISABLED_TEST(basename, test) TEST_F(basename, DISABLED_##test) +DISABLED_TEST(QualityScalerTest, DownscalesAfterContinuousFramedrop) { q_->PostTask([this] { TriggerScale(kScaleDown); }); EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs)); EXPECT_EQ(1, observer_->scaled_down); } -TEST_F(QualityScalerTest, KeepsScaleAtHighQp) { +DISABLED_TEST(QualityScalerTest, KeepsScaleAtHighQp) { q_->PostTask([this] { TriggerScale(kKeepScaleAtHighQp); }); EXPECT_FALSE(observer_->event.Wait(kDefaultTimeoutMs)); EXPECT_EQ(0, observer_->scaled_down); EXPECT_EQ(0, observer_->scaled_up); } -TEST_F(QualityScalerTest, DownscalesAboveHighQp) { +DISABLED_TEST(QualityScalerTest, DownscalesAboveHighQp) { q_->PostTask([this] { TriggerScale(kScaleDownAboveHighQp); }); EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs)); EXPECT_EQ(1, observer_->scaled_down); EXPECT_EQ(0, observer_->scaled_up); } -TEST_F(QualityScalerTest, DownscalesAfterTwoThirdsFramedrop) { +DISABLED_TEST(QualityScalerTest, DownscalesAfterTwoThirdsFramedrop) { q_->PostTask([this] { qs_->ReportDroppedFrame(); qs_->ReportDroppedFrame(); @@ -139,14 +140,14 @@ TEST_F(QualityScalerTest, DownscalesAfterTwoThirdsFramedrop) { EXPECT_EQ(0, observer_->scaled_up); } -TEST_F(QualityScalerTest, DoesNotDownscaleOnNormalQp) { +DISABLED_TEST(QualityScalerTest, DoesNotDownscaleOnNormalQp) { q_->PostTask([this] { TriggerScale(kScaleDownAboveHighQp); }); EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs)); EXPECT_EQ(1, observer_->scaled_down); EXPECT_EQ(0, observer_->scaled_up); } -TEST_F(QualityScalerTest, DoesNotDownscaleAfterHalfFramedrop) { +DISABLED_TEST(QualityScalerTest, DoesNotDownscaleAfterHalfFramedrop) { q_->PostTask([this] { qs_->ReportDroppedFrame(); qs_->ReportQP(kHighQp); @@ -156,14 +157,14 @@ TEST_F(QualityScalerTest, DoesNotDownscaleAfterHalfFramedrop) { EXPECT_EQ(0, observer_->scaled_up); } -TEST_F(QualityScalerTest, UpscalesAfterLowQp) { +DISABLED_TEST(QualityScalerTest, UpscalesAfterLowQp) { q_->PostTask([this] { TriggerScale(kScaleUp); }); EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs)); EXPECT_EQ(0, observer_->scaled_down); EXPECT_EQ(1, observer_->scaled_up); } -TEST_F(QualityScalerTest, ScalesDownAndBackUp) { +DISABLED_TEST(QualityScalerTest, ScalesDownAndBackUp) { q_->PostTask([this] { TriggerScale(kScaleDown); }); EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs)); EXPECT_EQ(1, observer_->scaled_down); @@ -173,5 +174,5 @@ TEST_F(QualityScalerTest, ScalesDownAndBackUp) { EXPECT_EQ(1, observer_->scaled_down); EXPECT_EQ(1, observer_->scaled_up); } - +#undef DISABLED_TEST } // namespace webrtc