From 7590ed797a1d41279a7359ba170a222a6693f8cb Mon Sep 17 00:00:00 2001
From: Ricardo Mariano <rmariano@squareup.com>
Date: Tue, 1 Jun 2021 11:06:49 +1000
Subject: [PATCH] Disable flaky grpc tests (#1952)

---
 misk/src/test/kotlin/misk/client/GrpcClientProviderTest.kt | 2 ++
 misk/src/test/kotlin/misk/grpc/GrpcConnectivityTest.kt     | 2 ++
 misk/src/test/kotlin/misk/web/JsonForProtoEndpointsTest.kt | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/misk/src/test/kotlin/misk/client/GrpcClientProviderTest.kt b/misk/src/test/kotlin/misk/client/GrpcClientProviderTest.kt
index 41a650f0688..a6c703e6681 100644
--- a/misk/src/test/kotlin/misk/client/GrpcClientProviderTest.kt
+++ b/misk/src/test/kotlin/misk/client/GrpcClientProviderTest.kt
@@ -32,6 +32,7 @@ import misk.web.jetty.JettyService
 import okhttp3.Response
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 
 @MiskTest(startService = true)
@@ -51,6 +52,7 @@ internal class GrpcClientProviderTest {
     robotLocator = clientInjector.getInstance()
   }
 
+  @Disabled("gRPC tests are flaky, see https://github.com/cashapp/misk/issues/1853")
   @Test
   fun happyPath() {
     assertThat(log).containsExactlyInAnyOrder(
diff --git a/misk/src/test/kotlin/misk/grpc/GrpcConnectivityTest.kt b/misk/src/test/kotlin/misk/grpc/GrpcConnectivityTest.kt
index 3b2a7bae508..bfa82011e1b 100644
--- a/misk/src/test/kotlin/misk/grpc/GrpcConnectivityTest.kt
+++ b/misk/src/test/kotlin/misk/grpc/GrpcConnectivityTest.kt
@@ -25,6 +25,7 @@ import okhttp3.RequestBody
 import okio.BufferedSink
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import java.io.InterruptedIOException
@@ -56,6 +57,7 @@ class GrpcConnectivityTest {
     client = clientInjector.getInstance(OkHttpClient::class.java)
   }
 
+  @Disabled("gRPC tests are flaky, see https://github.com/cashapp/misk/issues/1853")
   @Test
   fun happyPath() {
     val request = Request.Builder()
diff --git a/misk/src/test/kotlin/misk/web/JsonForProtoEndpointsTest.kt b/misk/src/test/kotlin/misk/web/JsonForProtoEndpointsTest.kt
index 3e069110e94..4e6a2d60fc6 100644
--- a/misk/src/test/kotlin/misk/web/JsonForProtoEndpointsTest.kt
+++ b/misk/src/test/kotlin/misk/web/JsonForProtoEndpointsTest.kt
@@ -25,12 +25,14 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import okio.ByteString
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import javax.inject.Inject
 
 /**
  * Test that we can send JSON to proto and gRPC endpoints.
  */
+@Disabled("gRPC tests are flaky, see https://github.com/cashapp/misk/issues/1853")
 @MiskTest(startService = true)
 internal class JsonForProtoEndpointsTest {
   @MiskTestModule