Skip to content

Commit

Permalink
Automated rollback of commit d84f799. (bazelbuild#14358)
Browse files Browse the repository at this point in the history
*** Reason for rollback ***

Breaks some targets.

PiperOrigin-RevId: 412968486

Co-authored-by: dacek <dacek@google.com>
  • Loading branch information
coeuvre and MarkDacek authored Dec 2, 2021
1 parent ffa12ad commit b46de75
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public MetadataProvider getMetadataProvider() {

@Override
public ArtifactExpander getArtifactExpander() {
return SIMPLE_ARTIFACT_EXPANDER;
throw new UnsupportedOperationException();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
import com.google.devtools.build.lib.exec.RemoteLocalFallbackRegistry;
import com.google.devtools.build.lib.exec.SpawnCheckingCacheEvent;
import com.google.devtools.build.lib.exec.SpawnExecutingEvent;
import com.google.devtools.build.lib.exec.SpawnInputExpander;
import com.google.devtools.build.lib.exec.SpawnRunner;
import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionContext;
import com.google.devtools.build.lib.exec.SpawnSchedulingEvent;
Expand Down Expand Up @@ -1268,7 +1267,6 @@ public void shouldReportCheckingCacheBeforeScheduling() throws Exception {

Spawn spawn = newSimpleSpawn();
SpawnExecutionContext policy = mock(SpawnExecutionContext.class);
when(policy.getSpawnInputExpander()).thenReturn(mock(SpawnInputExpander.class));
when(policy.getTimeout()).thenReturn(Duration.ZERO);

when(executor.executeRemotely(
Expand Down Expand Up @@ -1312,7 +1310,6 @@ public void shouldReportExecutingStatusWithoutMetadata() throws Exception {

Spawn spawn = newSimpleSpawn();
SpawnExecutionContext policy = mock(SpawnExecutionContext.class);
when(policy.getSpawnInputExpander()).thenReturn(mock(SpawnInputExpander.class));
when(policy.getTimeout()).thenReturn(Duration.ZERO);

when(executor.executeRemotely(
Expand Down Expand Up @@ -1356,7 +1353,6 @@ public void shouldReportExecutingStatusAfterGotExecutingStageFromMetadata() thro

Spawn spawn = newSimpleSpawn();
SpawnExecutionContext policy = mock(SpawnExecutionContext.class);
when(policy.getSpawnInputExpander()).thenReturn(mock(SpawnInputExpander.class));
when(policy.getTimeout()).thenReturn(Duration.ZERO);

when(executor.executeRemotely(
Expand Down Expand Up @@ -1417,7 +1413,6 @@ public void shouldIgnoreInvalidMetadata() throws Exception {

Spawn spawn = newSimpleSpawn();
SpawnExecutionContext policy = mock(SpawnExecutionContext.class);
when(policy.getSpawnInputExpander()).thenReturn(mock(SpawnInputExpander.class));
when(policy.getTimeout()).thenReturn(Duration.ZERO);

when(executor.executeRemotely(
Expand Down Expand Up @@ -1466,7 +1461,6 @@ public void shouldReportExecutingStatusIfNoExecutingStatusFromMetadata() throws

Spawn spawn = newSimpleSpawn();
SpawnExecutionContext policy = mock(SpawnExecutionContext.class);
when(policy.getSpawnInputExpander()).thenReturn(mock(SpawnInputExpander.class));
when(policy.getTimeout()).thenReturn(Duration.ZERO);

when(executor.executeRemotely(
Expand Down Expand Up @@ -1516,7 +1510,6 @@ public void shouldReportExecutingStatusEvenNoOperationFromServer() throws Except

Spawn spawn = newSimpleSpawn();
SpawnExecutionContext policy = mock(SpawnExecutionContext.class);
when(policy.getSpawnInputExpander()).thenReturn(mock(SpawnInputExpander.class));
when(policy.getTimeout()).thenReturn(Duration.ZERO);

when(executor.executeRemotely(
Expand Down

0 comments on commit b46de75

Please sign in to comment.