commit 20342c7c7ebab7729d347a3ec9a51b2f055c7f05
author Jakob Buchgraber <buchgr@google.com> Tue Nov 12 04:56:16 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Nov 12 04:57:13 2019 -0800
tree d3141fe734ba808005b24a0598510c36b8d97899
parent 1bc6fe2511bf363986215edd014b06bfcb758511

Move retry logic to where it's being used.

Simple refactoring that moves the retry logic from the
RemoteModule to the RemoteSpawnRunner where it's actually
being used.

Closes #10212.

PiperOrigin-RevId: 279938161

src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java
index 79c4380..c8eb2e8 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java
@@ -112,7 +112,6 @@
   private FileOutErr outErr;
 
   private RemoteOptions remoteOptions;
-  private RemoteRetrier retrier;
 
   @Mock private RemoteExecutionCache cache;
 
@@ -146,7 +145,6 @@
     outErr = new FileOutErr(stdout, stderr);
 
     remoteOptions = Options.getDefaults(RemoteOptions.class);
-    retrier = RemoteModule.createExecuteRetrier(remoteOptions, retryService);
   }
 
   @AfterClass
@@ -817,7 +815,7 @@
             "command-id",
             cache,
             executor,
-            retrier,
+            retryService,
             digestUtil,
             logDir,
             /* filesToDownload= */ ImmutableSet.of());
@@ -1014,7 +1012,7 @@
         "command-id",
         cache,
         executor,
-        retrier,
+        retryService,
         digestUtil,
         logDir,
         topLevelOutputs);