commit c0bbb0f6d9ae1633b6af84a292b58036bbcd0f89
author Googler <lberki@google.com> Thu Dec 01 00:30:29 2022 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Dec 01 00:31:50 2022 -0800
tree cb716c301dcaba05c7439b4a97e366c822ab3168
parent 60ded2b53d4d9180c213e9e44a8c640368e60822

Delete TestAttemptContinuation and SpawnContinuation and ActionContinuationOrResult .

RELNOTES: None.
PiperOrigin-RevId: 492123715
Change-Id: Ib8031f7b46ec1cc4c804868979de95058c8967e1

src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java

diff --git a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
index ba16e4e..66ecb01 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
@@ -295,7 +295,7 @@
         action, clientEnv, getTimeout(action), runfilesDir.relativeTo(execRoot), relativeTmpDir);
   }
 
-  private TestAttemptContinuation beginTestAttempt(
+  private TestAttemptResult beginTestAttempt(
       TestRunnerAction testAction,
       Spawn spawn,
       ActionExecutionContext actionExecutionContext,
@@ -579,8 +579,7 @@
     }
 
     @Override
-    public TestAttemptContinuation beginExecution()
-        throws InterruptedException, IOException, ExecException {
+    public TestAttemptResult execute() throws InterruptedException, IOException, ExecException {
       prepareFileSystem(testAction, execRoot, tmpDir, workingDirectory);
       return beginTestAttempt(testAction, spawn, actionExecutionContext, execRoot);
     }
@@ -632,7 +631,7 @@
             .build());
   }
 
-  private TestAttemptContinuation runTestAttempt(
+  private TestAttemptResult runTestAttempt(
       TestRunnerAction testAction,
       ActionExecutionContext actionExecutionContext,
       Spawn spawn,
@@ -830,16 +829,14 @@
 
     BuildEventStreamProtos.TestResult.ExecutionInfo executionInfo =
         extractExecutionInfo(spawnResults.get(0), testResultDataBuilder);
-    StandaloneTestResult standaloneTestResult =
-        StandaloneTestResult.builder()
-            .setSpawnResults(spawnResults)
-            // We return the TestResultData.Builder rather than the finished TestResultData
-            // instance, as we may have to rename the output files in case the test needs to be
-            // rerun (if it failed here _and_ is marked flaky _and_ the number of flaky attempts
-            // is larger than 1).
-            .setTestResultDataBuilder(testResultDataBuilder)
-            .setExecutionInfo(executionInfo)
-            .build();
-    return TestAttemptContinuation.of(standaloneTestResult);
+    return StandaloneTestResult.builder()
+        .setSpawnResults(spawnResults)
+        // We return the TestResultData.Builder rather than the finished TestResultData
+        // instance, as we may have to rename the output files in case the test needs to be
+        // rerun (if it failed here _and_ is marked flaky _and_ the number of flaky attempts
+        // is larger than 1).
+        .setTestResultDataBuilder(testResultDataBuilder)
+        .setExecutionInfo(executionInfo)
+        .build();
   }
 }