From 6348d5b37b84f549a14def26e7df4754691555a7 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Mon, 4 Dec 2017 17:33:37 +0100 Subject: [PATCH] Disable TimeUtilTest.TimeMicrosToNtpMatchRealTimeClockInitially on ios Bug: webrtc:8610 Change-Id: Idb572ae2ac364fee0a53e217adafc55b62d6683a Reviewed-on: https://webrtc-review.googlesource.com/29200 Reviewed-by: Oskar Sundbom Commit-Queue: Danil Chapovalov Cr-Commit-Position: refs/heads/master@{#21047} --- modules/rtp_rtcp/source/time_util_unittest.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/rtp_rtcp/source/time_util_unittest.cc b/modules/rtp_rtcp/source/time_util_unittest.cc index cdf271284b..25cda491f9 100644 --- a/modules/rtp_rtcp/source/time_util_unittest.cc +++ b/modules/rtp_rtcp/source/time_util_unittest.cc @@ -16,7 +16,15 @@ namespace webrtc { -TEST(TimeUtilTest, TimeMicrosToNtpMatchRealTimeClockInitially) { +// Disabled as flake: http://bugs.webrtc.org/8610 +#ifdef WEBRTC_IOS +#define MAYBE_TimeMicrosToNtpMatchRealTimeClockInitially \ + DISABLED_TimeMicrosToNtpMatchRealTimeClockInitially +#else +#define MAYBE_TimeMicrosToNtpMatchRealTimeClockInitially \ + TimeMicrosToNtpMatchRealTimeClockInitially +#endif +TEST(TimeUtilTest, MAYBE_TimeMicrosToNtpMatchRealTimeClockInitially) { Clock* legacy_clock = Clock::GetRealTimeClock(); NtpTime before_legacy_time = TimeMicrosToNtp(rtc::TimeMicros()); NtpTime legacy_time = legacy_clock->CurrentNtpTime();