From f8c1bd826cd232d83b78bb5896ed31effd9a5acd Mon Sep 17 00:00:00 2001
From: kpayson64 <kpayson@google.com>
Date: Fri, 18 May 2018 10:26:04 -0700
Subject: [PATCH] Fix fork test flake

---
 test/core/gprpp/fork_test.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/core/gprpp/fork_test.cc b/test/core/gprpp/fork_test.cc
index 05820eb8855..642f910489c 100644
--- a/test/core/gprpp/fork_test.cc
+++ b/test/core/gprpp/fork_test.cc
@@ -42,8 +42,12 @@ static void test_init() {
   grpc_core::Fork::GlobalShutdown();
 }
 
-#define THREAD_DELAY_MS 3000
-#define THREAD_DELAY_EPSILON 500
+// This spawns CONCURRENT_TEST_THREADS that last up to
+// THREAD_DELAY_MS, and checks that the Fork::AwaitThreads()
+// returns roughly after THREAD_DELAY_MS.  The epsilon is high
+// because tsan threads can take a while to spawn/join.
+#define THREAD_DELAY_MS 6000
+#define THREAD_DELAY_EPSILON 1500
 #define CONCURRENT_TEST_THREADS 100
 
 static void sleeping_thd(void* arg) {