Update StandaloneSpawnStrategyTest to use SpawnStrategyResolver.
Part of the roll-forward of
@@ -35,7 +35,6 @@ import com.google.devtools.build.lib.actions.ResourceSet;
import com.google.devtools.build.lib.actions.SimpleSpawn;
import com.google.devtools.build.lib.actions.Spawn;
import com.google.devtools.build.lib.actions.SpawnResult;
-import com.google.devtools.build.lib.actions.SpawnStrategy;
import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
import com.google.devtools.build.lib.analysis.BlazeDirectories;
import com.google.devtools.build.lib.analysis.ServerDirectories;
@@ -49,6 +48,7 @@ import com.google.devtools.build.lib.exec.BlazeExecutor;
import com.google.devtools.build.lib.exec.ExecutionOptions;
import com.google.devtools.build.lib.exec.RunfilesTreeUpdater;
import com.google.devtools.build.lib.exec.SingleBuildFileCache;
+import com.google.devtools.build.lib.exec.SpawnStrategyResolver;
import com.google.devtools.build.lib.exec.local.LocalExecutionOptions;
import com.google.devtools.build.lib.exec.local.LocalSpawnRunner;
import com.google.devtools.build.lib.exec.util.TestExecutorBuilder;
@@ -181,7 +181,7 @@ public class StandaloneSpawnStrategyTest {
@Test
public void testBinTrueExecutesFine() throws Exception {
Spawn spawn = createSpawn(getTrueCommand());
- executor.getContext(SpawnStrategy.class).exec(spawn, createContext());
+ executor.getContext(SpawnStrategyResolver.class).exec(spawn, createContext());
if (OS.getCurrent() != OS.WINDOWS) {
assertThat(out()).isEmpty();
@@ -190,7 +190,7 @@ public class StandaloneSpawnStrategyTest {
}
private List<SpawnResult> run(Spawn spawn) throws Exception {
- return executor.getContext(SpawnStrategy.class).exec(spawn, createContext());
+ return executor.getContext(SpawnStrategyResolver.class).exec(spawn, createContext());
}
private ActionExecutionContext createContext() {
