commit acd291a520d392977a2efff17949b75c2fa80eef
author ulfjack <ulfjack@google.com> Fri Jun 16 15:25:42 2017 +0200
committer Philipp Wollermann <philwo@google.com> Mon Jun 19 18:23:00 2017 +0200
tree a3da9f3eda8844425cdbb28d291eedee400c8069
parent 560bcb8653947d5d38fa9710c25b7eff6596b2fc

Rewrite StandaloneSpawnStrategy to use LocalSpawnRunner

PiperOrigin-RevId: 159221067

src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
index 5f43763..4935545 100644
--- a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
@@ -22,6 +22,8 @@
 import com.google.common.collect.Sets;
 import com.google.common.eventbus.EventBus;
 import com.google.devtools.build.lib.actions.ActionExecutionContext;
+import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
 import com.google.devtools.build.lib.actions.BaseSpawn;
 import com.google.devtools.build.lib.actions.ExecException;
 import com.google.devtools.build.lib.actions.Executor.ActionContext;
@@ -34,22 +36,26 @@
 import com.google.devtools.build.lib.events.PrintingEventHandler;
 import com.google.devtools.build.lib.events.Reporter;
 import com.google.devtools.build.lib.exec.ActionContextProvider;
+import com.google.devtools.build.lib.exec.ActionInputPrefetcher;
 import com.google.devtools.build.lib.exec.BlazeExecutor;
 import com.google.devtools.build.lib.exec.ExecutionOptions;
 import com.google.devtools.build.lib.exec.SingleBuildFileCache;
+import com.google.devtools.build.lib.exec.local.LocalExecutionOptions;
 import com.google.devtools.build.lib.integration.util.IntegrationMock;
 import com.google.devtools.build.lib.testutil.TestConstants;
-import com.google.devtools.build.lib.testutil.TestFileOutErr;
 import com.google.devtools.build.lib.testutil.TestUtils;
 import com.google.devtools.build.lib.util.BlazeClock;
 import com.google.devtools.build.lib.util.OS;
+import com.google.devtools.build.lib.util.io.FileOutErr;
 import com.google.devtools.build.lib.vfs.FileSystem;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.util.FileSystems;
+import com.google.devtools.common.options.Options;
 import com.google.devtools.common.options.OptionsParser;
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Collection;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -60,11 +66,19 @@
  */
 @RunWith(JUnit4.class)
 public class StandaloneSpawnStrategyTest {
+  private static final ArtifactExpander SIMPLE_ARTIFACT_EXPANDER =
+      new ArtifactExpander() {
+        @Override
+        public void expand(Artifact artifact, Collection<? super Artifact> output) {
+          output.add(artifact);
+        }
+      };
 
   private Reporter reporter =
       new Reporter(new EventBus(), PrintingEventHandler.ERRORS_AND_WARNINGS_TO_STDERR);
   private BlazeExecutor executor;
   private FileSystem fileSystem;
+  private FileOutErr outErr;
 
   private Path createTestRoot() throws IOException {
     fileSystem = FileSystems.getNativeFileSystem();
@@ -83,6 +97,7 @@
     Path testRoot = createTestRoot();
     Path workspaceDir = testRoot.getRelative("workspace-name");
     workspaceDir.createDirectory();
+    outErr = new FileOutErr(testRoot.getRelative("stdout"), testRoot.getRelative("stderr"));
 
     // setup output base & directories
     Path outputBase = testRoot.getRelative("outputBase");
@@ -94,6 +109,7 @@
     IntegrationMock.get().getIntegrationBinTools(directories, TestConstants.WORKSPACE_NAME);
     OptionsParser optionsParser = OptionsParser.newOptionsParser(ExecutionOptions.class);
     optionsParser.parse("--verbose_failures");
+    LocalExecutionOptions localExecutionOptions = Options.getDefaults(LocalExecutionOptions.class);
 
     EventBus bus = new EventBus();
 
@@ -112,7 +128,8 @@
             ImmutableMap.<String, SpawnActionContext>of(
                 "",
                 new StandaloneSpawnStrategy(
-                    execRoot, false, "mock-product-name", resourceManager)),
+                    execRoot, ActionInputPrefetcher.NONE, localExecutionOptions,
+                    /*verboseFailures=*/false, "mock-product-name", resourceManager)),
             ImmutableList.<ActionContextProvider>of());
 
     executor.getExecRoot().createDirectory();
@@ -126,8 +143,6 @@
         ResourceSet.ZERO);
   }
 
-  private TestFileOutErr outErr = new TestFileOutErr();
-
   private String out() {
     return outErr.outAsLatin1();
   }
@@ -155,7 +170,7 @@
         null,
         outErr,
         ImmutableMap.<String, String>of(),
-        null);
+        SIMPLE_ARTIFACT_EXPANDER);
   }
 
   @Test