admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Increase test timeout to combat flakiness.

Browse Source 
These tests have been a little flaky on the bots.
Hopefully increasing the timeout by 200% will help.

BUG=webrtc:6799

Review-Url: https://codereview.webrtc.org/2541743006
Cr-Commit-Position: refs/heads/master@{#15355}
This commit is contained in:
kthelgason 2016-12-01 02:57:01 -08:00 committed by Commit bot
parent e90adcef42
commit 86cf9a2474
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
webrtc/modules/video_coding/utility/quality_scaler_unittest.cc
View File

@ -23,7 +23,7 @@ static const int kFramerate = 30;
static const int kLowQp = 15; static const int kLowQp = 15;
static const int kLowQpThreshold = 18; static const int kLowQpThreshold = 18;
static const int kHighQp = 40; static const int kHighQp = 40;
static const size_t kDefaultTimeoutMs = 1000; static const size_t kDefaultTimeoutMs = 150;
} // namespace } // namespace
class MockScaleObserver : public ScalingObserverInterface { class MockScaleObserver : public ScalingObserverInterface {
@ -110,20 +110,20 @@ class QualityScalerTest : public ::testing::Test {
TEST_F(QualityScalerTest, DownscalesAfterContinuousFramedrop) { TEST_F(QualityScalerTest, DownscalesAfterContinuousFramedrop) {
q_->PostTask([this] { TriggerScale(kScaleDown); }); q_->PostTask([this] { TriggerScale(kScaleDown); });
EXPECT_TRUE(observer_->event.Wait(50)); EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs));
EXPECT_EQ(1, observer_->scaled_down); EXPECT_EQ(1, observer_->scaled_down);
} }
TEST_F(QualityScalerTest, KeepsScaleAtHighQp) { TEST_F(QualityScalerTest, KeepsScaleAtHighQp) {
q_->PostTask([this] { TriggerScale(kKeepScaleAtHighQp); }); q_->PostTask([this] { TriggerScale(kKeepScaleAtHighQp); });
EXPECT_FALSE(observer_->event.Wait(50)); EXPECT_FALSE(observer_->event.Wait(kDefaultTimeoutMs));
EXPECT_EQ(0, observer_->scaled_down); EXPECT_EQ(0, observer_->scaled_down);
EXPECT_EQ(0, observer_->scaled_up); EXPECT_EQ(0, observer_->scaled_up);
} }
TEST_F(QualityScalerTest, DownscalesAboveHighQp) { TEST_F(QualityScalerTest, DownscalesAboveHighQp) {
q_->PostTask([this] { TriggerScale(kScaleDownAboveHighQp); }); q_->PostTask([this] { TriggerScale(kScaleDownAboveHighQp); });
EXPECT_TRUE(observer_->event.Wait(50)); EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs));
EXPECT_EQ(1, observer_->scaled_down); EXPECT_EQ(1, observer_->scaled_down);
EXPECT_EQ(0, observer_->scaled_up); EXPECT_EQ(0, observer_->scaled_up);
} }
@ -134,14 +134,14 @@ TEST_F(QualityScalerTest, DownscalesAfterTwoThirdsFramedrop) {
qs_->ReportDroppedFrame(); qs_->ReportDroppedFrame();
qs_->ReportQP(kHighQp); qs_->ReportQP(kHighQp);
}); });
EXPECT_TRUE(observer_->event.Wait(50)); EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs));
EXPECT_EQ(1, observer_->scaled_down); EXPECT_EQ(1, observer_->scaled_down);
EXPECT_EQ(0, observer_->scaled_up); EXPECT_EQ(0, observer_->scaled_up);
} }
TEST_F(QualityScalerTest, DoesNotDownscaleOnNormalQp) { TEST_F(QualityScalerTest, DoesNotDownscaleOnNormalQp) {
q_->PostTask([this] { TriggerScale(kScaleDownAboveHighQp); }); q_->PostTask([this] { TriggerScale(kScaleDownAboveHighQp); });
EXPECT_TRUE(observer_->event.Wait(50)); EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs));
EXPECT_EQ(1, observer_->scaled_down); EXPECT_EQ(1, observer_->scaled_down);
EXPECT_EQ(0, observer_->scaled_up); EXPECT_EQ(0, observer_->scaled_up);
} }
@ -151,25 +151,25 @@ TEST_F(QualityScalerTest, DoesNotDownscaleAfterHalfFramedrop) {
qs_->ReportDroppedFrame(); qs_->ReportDroppedFrame();
qs_->ReportQP(kHighQp); qs_->ReportQP(kHighQp);
}); });
EXPECT_FALSE(observer_->event.Wait(50)); EXPECT_FALSE(observer_->event.Wait(kDefaultTimeoutMs));
EXPECT_EQ(0, observer_->scaled_down); EXPECT_EQ(0, observer_->scaled_down);
EXPECT_EQ(0, observer_->scaled_up); EXPECT_EQ(0, observer_->scaled_up);
} }
TEST_F(QualityScalerTest, UpscalesAfterLowQp) { TEST_F(QualityScalerTest, UpscalesAfterLowQp) {
q_->PostTask([this] { TriggerScale(kScaleUp); }); q_->PostTask([this] { TriggerScale(kScaleUp); });
EXPECT_TRUE(observer_->event.Wait(50)); EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs));
EXPECT_EQ(0, observer_->scaled_down); EXPECT_EQ(0, observer_->scaled_down);
EXPECT_EQ(1, observer_->scaled_up); EXPECT_EQ(1, observer_->scaled_up);
} }
TEST_F(QualityScalerTest, ScalesDownAndBackUp) { TEST_F(QualityScalerTest, ScalesDownAndBackUp) {
q_->PostTask([this] { TriggerScale(kScaleDown); }); q_->PostTask([this] { TriggerScale(kScaleDown); });
EXPECT_TRUE(observer_->event.Wait(50)); EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs));
EXPECT_EQ(1, observer_->scaled_down); EXPECT_EQ(1, observer_->scaled_down);
EXPECT_EQ(0, observer_->scaled_up); EXPECT_EQ(0, observer_->scaled_up);
q_->PostTask([this] { TriggerScale(kScaleUp); }); q_->PostTask([this] { TriggerScale(kScaleUp); });
EXPECT_TRUE(observer_->event.Wait(50)); EXPECT_TRUE(observer_->event.Wait(kDefaultTimeoutMs));
EXPECT_EQ(1, observer_->scaled_down); EXPECT_EQ(1, observer_->scaled_down);
EXPECT_EQ(1, observer_->scaled_up); EXPECT_EQ(1, observer_->scaled_up);
} }