|  | 
| 74 | 74 | import com.google.devtools.build.lib.exec.RemoteLocalFallbackRegistry; | 
| 75 | 75 | import com.google.devtools.build.lib.exec.SpawnCheckingCacheEvent; | 
| 76 | 76 | import com.google.devtools.build.lib.exec.SpawnExecutingEvent; | 
|  | 77 | +import com.google.devtools.build.lib.exec.SpawnInputExpander; | 
| 77 | 78 | import com.google.devtools.build.lib.exec.SpawnRunner; | 
| 78 | 79 | import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionContext; | 
| 79 | 80 | import com.google.devtools.build.lib.exec.SpawnSchedulingEvent; | 
| @@ -1267,6 +1268,7 @@ public void shouldReportCheckingCacheBeforeScheduling() throws Exception { | 
| 1267 | 1268 | 
 | 
| 1268 | 1269 |     Spawn spawn = newSimpleSpawn(); | 
| 1269 | 1270 |     SpawnExecutionContext policy = mock(SpawnExecutionContext.class); | 
|  | 1271 | +    when(policy.getSpawnInputExpander()).thenReturn(mock(SpawnInputExpander.class)); | 
| 1270 | 1272 |     when(policy.getTimeout()).thenReturn(Duration.ZERO); | 
| 1271 | 1273 | 
 | 
| 1272 | 1274 |     when(executor.executeRemotely( | 
| @@ -1310,6 +1312,7 @@ public void shouldReportExecutingStatusWithoutMetadata() throws Exception { | 
| 1310 | 1312 | 
 | 
| 1311 | 1313 |     Spawn spawn = newSimpleSpawn(); | 
| 1312 | 1314 |     SpawnExecutionContext policy = mock(SpawnExecutionContext.class); | 
|  | 1315 | +    when(policy.getSpawnInputExpander()).thenReturn(mock(SpawnInputExpander.class)); | 
| 1313 | 1316 |     when(policy.getTimeout()).thenReturn(Duration.ZERO); | 
| 1314 | 1317 | 
 | 
| 1315 | 1318 |     when(executor.executeRemotely( | 
| @@ -1353,6 +1356,7 @@ public void shouldReportExecutingStatusAfterGotExecutingStageFromMetadata() thro | 
| 1353 | 1356 | 
 | 
| 1354 | 1357 |     Spawn spawn = newSimpleSpawn(); | 
| 1355 | 1358 |     SpawnExecutionContext policy = mock(SpawnExecutionContext.class); | 
|  | 1359 | +    when(policy.getSpawnInputExpander()).thenReturn(mock(SpawnInputExpander.class)); | 
| 1356 | 1360 |     when(policy.getTimeout()).thenReturn(Duration.ZERO); | 
| 1357 | 1361 | 
 | 
| 1358 | 1362 |     when(executor.executeRemotely( | 
| @@ -1413,6 +1417,7 @@ public void shouldIgnoreInvalidMetadata() throws Exception { | 
| 1413 | 1417 | 
 | 
| 1414 | 1418 |     Spawn spawn = newSimpleSpawn(); | 
| 1415 | 1419 |     SpawnExecutionContext policy = mock(SpawnExecutionContext.class); | 
|  | 1420 | +    when(policy.getSpawnInputExpander()).thenReturn(mock(SpawnInputExpander.class)); | 
| 1416 | 1421 |     when(policy.getTimeout()).thenReturn(Duration.ZERO); | 
| 1417 | 1422 | 
 | 
| 1418 | 1423 |     when(executor.executeRemotely( | 
| @@ -1461,6 +1466,7 @@ public void shouldReportExecutingStatusIfNoExecutingStatusFromMetadata() throws | 
| 1461 | 1466 | 
 | 
| 1462 | 1467 |     Spawn spawn = newSimpleSpawn(); | 
| 1463 | 1468 |     SpawnExecutionContext policy = mock(SpawnExecutionContext.class); | 
|  | 1469 | +    when(policy.getSpawnInputExpander()).thenReturn(mock(SpawnInputExpander.class)); | 
| 1464 | 1470 |     when(policy.getTimeout()).thenReturn(Duration.ZERO); | 
| 1465 | 1471 | 
 | 
| 1466 | 1472 |     when(executor.executeRemotely( | 
| @@ -1510,6 +1516,7 @@ public void shouldReportExecutingStatusEvenNoOperationFromServer() throws Except | 
| 1510 | 1516 | 
 | 
| 1511 | 1517 |     Spawn spawn = newSimpleSpawn(); | 
| 1512 | 1518 |     SpawnExecutionContext policy = mock(SpawnExecutionContext.class); | 
|  | 1519 | +    when(policy.getSpawnInputExpander()).thenReturn(mock(SpawnInputExpander.class)); | 
| 1513 | 1520 |     when(policy.getTimeout()).thenReturn(Duration.ZERO); | 
| 1514 | 1521 | 
 | 
| 1515 | 1522 |     when(executor.executeRemotely( | 
|  | 
0 commit comments