From 0ba4dad788069710a6ac95bbc0573ba4d42797bd Mon Sep 17 00:00:00 2001 From: "drsanta@google.com" Date: Mon, 6 Jul 2020 15:35:12 -0400 Subject: [PATCH 1/3] attempt to add a longer sleep for auth test flake --- auth/tests/desktop/test_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auth/tests/desktop/test_utils.h b/auth/tests/desktop/test_utils.h index 97d0379de2..f132c6d193 100644 --- a/auth/tests/desktop/test_utils.h +++ b/auth/tests/desktop/test_utils.h @@ -266,7 +266,7 @@ class AuthStateChangesCounter : public detail::ListenerChangeCounter, class SleepUponDestruction { public: ~SleepUponDestruction() { - firebase::internal::Sleep(200); + firebase::internal::Sleep(1000); } }; From 629a1824abe3114f3f0560a86190c076196aab5b Mon Sep 17 00:00:00 2001 From: "drsanta@google.com" Date: Mon, 6 Jul 2020 17:39:46 -0400 Subject: [PATCH 2/3] increasing scheduler test delay for deflakiness --- app/tests/scheduler_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/tests/scheduler_test.cc b/app/tests/scheduler_test.cc index 3a9baaf123..e449ca81a2 100644 --- a/app/tests/scheduler_test.cc +++ b/app/tests/scheduler_test.cc @@ -241,7 +241,7 @@ TEST_F(SchedulerTest, RepeatCallbackNoDelay) { } TEST_F(SchedulerTest, RepeatCallbackWithDelay) { - int delay = 100; + int delay = 1000; scheduler_.Schedule(new callback::CallbackVoid(SemaphorePost1), delay, 1); auto start = internal::GetTimestamp(); From f3ae59f9c9bb00edd4fd5b02dbd981d2ca12a7e3 Mon Sep 17 00:00:00 2001 From: "drsanta@google.com" Date: Tue, 7 Jul 2020 13:25:19 -0400 Subject: [PATCH 3/3] altered ScehdulerTest.RepeatCallbackWithDelay to be a bit more forgiving --- app/tests/scheduler_test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/tests/scheduler_test.cc b/app/tests/scheduler_test.cc index e449ca81a2..2d8c15393e 100644 --- a/app/tests/scheduler_test.cc +++ b/app/tests/scheduler_test.cc @@ -241,7 +241,7 @@ TEST_F(SchedulerTest, RepeatCallbackNoDelay) { } TEST_F(SchedulerTest, RepeatCallbackWithDelay) { - int delay = 1000; + int delay = 100; scheduler_.Schedule(new callback::CallbackVoid(SemaphorePost1), delay, 1); auto start = internal::GetTimestamp(); @@ -253,7 +253,7 @@ TEST_F(SchedulerTest, RepeatCallbackWithDelay) { int error = abs(actual_delay - delay); printf("Delay: %dms. Actual delay: %dms. Error: %dms\n", delay, actual_delay, error); - EXPECT_TRUE(error < 0.1 * internal::kMillisecondsPerSecond); + EXPECT_TRUE(error < 0.2 * internal::kMillisecondsPerSecond); // Wait for it to repeat 100 times for (int i = 0; i < 100; ++i) {