Fixing the handling of retries for watch and execute calls.

TESTED=remote worker, triggered some errors
RELNOTES: fixes #3305, helps #3356
PiperOrigin-RevId: 161722997

1 files changed, 14 insertions, 0 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/remote/RetrierTest.java b/src/test/java/com/google/devtools/build/lib/remote/RetrierTest.java
index 9a8e464914..d55e2b659d 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/RetrierTest.java
+++ b/src/test/java/com/google/devtools/build/lib/remote/RetrierTest.java
@@ -19,6 +19,7 @@ import static org.mockito.Mockito.when;
 
 import com.google.common.collect.Range;
 import io.grpc.Status;
+import io.grpc.StatusRuntimeException;
 import java.io.IOException;
 import java.time.Duration;
 import org.junit.Before;
@@ -124,6 +125,19 @@ public class RetrierTest {
   }
 
   @Test
+  public void testPassThroughException() throws Exception {
+    StatusRuntimeException thrown = Status.Code.UNKNOWN.toStatus().asRuntimeException();
+    try {
+      Retrier.NO_RETRIES.execute(() -> {
+        throw new Retrier.PassThroughException(thrown);
+      });
+      fail();
+    } catch (StatusRuntimeException expected) {
+      assertThat(expected).isSameAs(thrown);
+    }
+  }
+
+  @Test
   public void testIOExceptionIsPassedThrough() throws Exception {
     IOException thrown = new IOException();
     try {