@@ -258,7 +258,7 @@ public void vanillaZeroExit() throws Exception {
258
258
assertThat (result .status ()).isEqualTo (SpawnResult .Status .SUCCESS );
259
259
assertThat (result .exitCode ()).isEqualTo (0 );
260
260
assertThat (result .setupSuccess ()).isTrue ();
261
- assertThat (result .getExecutorHostName ()).isEqualTo (NetUtil .findShortHostName ());
261
+ assertThat (result .getExecutorHostName ()).isEqualTo (NetUtil .getCachedShortHostName ());
262
262
263
263
assertThat (captor .getValue ().getArgv ())
264
264
.containsExactlyElementsIn (
@@ -304,7 +304,7 @@ public void noProcessWrapper() throws Exception {
304
304
assertThat (result .status ()).isEqualTo (SpawnResult .Status .SUCCESS );
305
305
assertThat (result .exitCode ()).isEqualTo (0 );
306
306
assertThat (result .setupSuccess ()).isTrue ();
307
- assertThat (result .getExecutorHostName ()).isEqualTo (NetUtil .findShortHostName ());
307
+ assertThat (result .getExecutorHostName ()).isEqualTo (NetUtil .getCachedShortHostName ());
308
308
309
309
assertThat (captor .getValue ().getArgv ())
310
310
.containsExactlyElementsIn (ImmutableList .of ("/bin/echo" , "Hi!" ));
@@ -339,7 +339,7 @@ public void nonZeroExit() throws Exception {
339
339
assertThat (result .status ()).isEqualTo (SpawnResult .Status .SUCCESS );
340
340
assertThat (result .exitCode ()).isEqualTo (3 );
341
341
assertThat (result .setupSuccess ()).isTrue ();
342
- assertThat (result .getExecutorHostName ()).isEqualTo (NetUtil .findShortHostName ());
342
+ assertThat (result .getExecutorHostName ()).isEqualTo (NetUtil .getCachedShortHostName ());
343
343
344
344
assertThat (captor .getValue ().getArgv ())
345
345
.containsExactlyElementsIn (
@@ -377,7 +377,7 @@ public void processStartupThrows() throws Exception {
377
377
assertThat (result .exitCode ()).isEqualTo (-1 );
378
378
assertThat (result .setupSuccess ()).isFalse ();
379
379
assertThat (result .getWallTimeMillis ()).isEqualTo (0 );
380
- assertThat (result .getExecutorHostName ()).isEqualTo (NetUtil .findShortHostName ());
380
+ assertThat (result .getExecutorHostName ()).isEqualTo (NetUtil .getCachedShortHostName ());
381
381
382
382
assertThat (FileSystemUtils .readContent (fs .getPath ("/out/stderr" ), StandardCharsets .UTF_8 ))
383
383
.isEqualTo ("Action failed to execute: java.io.IOException: I'm sorry, Dave\n " );
@@ -399,7 +399,7 @@ public void disallowLocalExecution() throws Exception {
399
399
assertThat (reply .exitCode ()).isEqualTo (-1 );
400
400
assertThat (reply .setupSuccess ()).isFalse ();
401
401
assertThat (reply .getWallTimeMillis ()).isEqualTo (0 );
402
- assertThat (reply .getExecutorHostName ()).isEqualTo (NetUtil .findShortHostName ());
402
+ assertThat (reply .getExecutorHostName ()).isEqualTo (NetUtil .getCachedShortHostName ());
403
403
404
404
// TODO(ulfjack): Maybe we should only lock after checking?
405
405
assertThat (policy .lockOutputFilesCalled ).isTrue ();
0 commit comments