commit 7d3f602dbc8ed5ab2da39fb923811c8838f4eef1
author Patrik Höglund <phoglund@webrtc.org> Mon Mar 02 13:45:21 2020
committer Commit Bot <commit-bot@chromium.org> Mon Mar 02 14:21:08 2020
tree a002b39a9e6b742904b76e3707c8f8742ec2ea56
parent b03422a7370c3408630d301807aaf290cde75fc5

Make scenario tests more tolerant on iOS.

Making these tests run shorter broke them on iOS. I think we can just
be more tolerant on iOS.

This also tried to re-enable the test on dbg; hopefully the increased
tolerance is enough.

Bug: None
Change-Id: Ic8c54dd46b0f5cb219b0c16da81c9486f6c45f10
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/169440
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30660}

test/scenario/scenario_unittest.cc

diff --git a/test/scenario/scenario_unittest.cc b/test/scenario/scenario_unittest.cc
index 3173472..839e6a3 100644
--- a/test/scenario/scenario_unittest.cc
+++ b/test/scenario/scenario_unittest.cc
@@ -88,13 +88,7 @@
 }
 }  // namespace
 
-// TODO(bugs.webrtc.org/10515): Remove this when performance has been improved.
-#if defined(WEBRTC_IOS) && defined(WEBRTC_ARCH_ARM64) && !defined(NDEBUG)
-#define MAYBE_SimTimeEncoding DISABLED_SimTimeEncoding
-#else
-#define MAYBE_SimTimeEncoding SimTimeEncoding
-#endif
-TEST(ScenarioTest, MAYBE_SimTimeEncoding) {
+TEST(ScenarioTest, SimTimeEncoding) {
   VideoQualityAnalyzerConfig analyzer_config;
   analyzer_config.psnr_coverage = 0.1;
   VideoQualityAnalyzer analyzer(analyzer_config);
@@ -105,7 +99,7 @@
   }
   // Regression tests based on previous runs.
   EXPECT_EQ(analyzer.stats().lost_count, 0);
-  EXPECT_NEAR(analyzer.stats().psnr_with_freeze.Mean(), 38, 3);
+  EXPECT_NEAR(analyzer.stats().psnr_with_freeze.Mean(), 38, 5);
 }
 
 // TODO(bugs.webrtc.org/10515): Remove this when performance has been improved.