diff options
Diffstat (limited to 'src/test/java/com/google')
3 files changed, 5 insertions, 5 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/concurrent/BatchedKeyedLockerTest.java b/src/test/java/com/google/devtools/build/lib/concurrent/BatchedKeyedLockerTest.java index 2e5f8a8dc6..e2449d9db5 100644 --- a/src/test/java/com/google/devtools/build/lib/concurrent/BatchedKeyedLockerTest.java +++ b/src/test/java/com/google/devtools/build/lib/concurrent/BatchedKeyedLockerTest.java @@ -148,7 +148,7 @@ public abstract class BatchedKeyedLockerTest extends KeyedLockerTest { } })); } - boolean interrupted = ExecutorShutdownUtil.interruptibleShutdown(executorService); + boolean interrupted = ExecutorUtil.interruptibleShutdown(executorService); Throwables.propagateIfPossible(wrapper.getFirstThrownError()); if (interrupted) { Thread.currentThread().interrupt(); diff --git a/src/test/java/com/google/devtools/build/lib/concurrent/KeyedFrequencyStoreTest.java b/src/test/java/com/google/devtools/build/lib/concurrent/KeyedFrequencyStoreTest.java index 47a34e9226..95896e0534 100644 --- a/src/test/java/com/google/devtools/build/lib/concurrent/KeyedFrequencyStoreTest.java +++ b/src/test/java/com/google/devtools/build/lib/concurrent/KeyedFrequencyStoreTest.java @@ -93,7 +93,7 @@ public abstract class KeyedFrequencyStoreTest { for (int i = 0; i < NUM_EXECUTOR_THREADS; i++) { executorService.submit(wrapper.wrap(runnable)); } - boolean interrupted = ExecutorShutdownUtil.interruptibleShutdown(executorService); + boolean interrupted = ExecutorUtil.interruptibleShutdown(executorService); Throwables.propagateIfPossible(wrapper.getFirstThrownError()); if (interrupted) { Thread.currentThread().interrupt(); diff --git a/src/test/java/com/google/devtools/build/lib/concurrent/KeyedLockerTest.java b/src/test/java/com/google/devtools/build/lib/concurrent/KeyedLockerTest.java index 9ee806afd8..1549a548ac 100644 --- a/src/test/java/com/google/devtools/build/lib/concurrent/KeyedLockerTest.java +++ b/src/test/java/com/google/devtools/build/lib/concurrent/KeyedLockerTest.java @@ -165,7 +165,7 @@ public abstract class KeyedLockerTest { for (int i = 0; i < NUM_EXECUTOR_THREADS; i++) { executorService.submit(wrapper.wrap(runnable)); } - boolean interrupted = ExecutorShutdownUtil.interruptibleShutdown(executorService); + boolean interrupted = ExecutorUtil.interruptibleShutdown(executorService); Throwables.propagateIfPossible(wrapper.getFirstThrownError()); if (interrupted) { Thread.currentThread().interrupt(); @@ -210,7 +210,7 @@ public abstract class KeyedLockerTest { }; executorService.submit(wrapper.wrap(runnable1)); executorService.submit(wrapper.wrap(runnable2)); - boolean interrupted = ExecutorShutdownUtil.interruptibleShutdown(executorService); + boolean interrupted = ExecutorUtil.interruptibleShutdown(executorService); Throwables.propagateIfPossible(wrapper.getFirstThrownError()); if (interrupted || runnableInterrupted.get()) { Thread.currentThread().interrupt(); @@ -264,7 +264,7 @@ public abstract class KeyedLockerTest { for (int i = 0; i < NUM_EXECUTOR_THREADS; i++) { executorService.submit(wrapper.wrap(runnable)); } - boolean interrupted = ExecutorShutdownUtil.interruptibleShutdown(executorService); + boolean interrupted = ExecutorUtil.interruptibleShutdown(executorService); Throwables.propagateIfPossible(wrapper.getFirstThrownError()); if (interrupted || runnableInterrupted.get()) { Thread.currentThread().interrupt(); |