commit a67bb8b2ad5506c2a3c7c4476d9878d4f916656d
author Janak Ramakrishnan <janakr@google.com> Wed Sep 02 17:56:08 2015 +0000
committer Florian Weikert <fwe@google.com> Wed Sep 02 21:08:04 2015 +0000
tree b01d6c99919f3dc5882115da32e477384098c52f
parent 2e003439cecfe87e318037f19ffd5e3761724948

Use TrackingAwaiter properly to track lost exceptions. Using the static method wasn't guaranteed to catch all bugs. Also convert to a singleton since there's no reason to have multiple instances.

--
MOS_MIGRATED_REVID=102158719

src/test/java/com/google/devtools/build/skyframe/ChainedFunction.java

diff --git a/src/test/java/com/google/devtools/build/skyframe/ChainedFunction.java b/src/test/java/com/google/devtools/build/skyframe/ChainedFunction.java
index 4f87bb3..48325b0 100644
--- a/src/test/java/com/google/devtools/build/skyframe/ChainedFunction.java
+++ b/src/test/java/com/google/devtools/build/skyframe/ChainedFunction.java
@@ -54,12 +54,12 @@
         notifyStart.countDown();
       }
       if (waitToFinish != null) {
-        TrackingAwaiter.waitAndMaybeThrowInterrupt(waitToFinish,
-            key + " timed out waiting to finish");
+        TrackingAwaiter.INSTANCE.awaitLatchAndTrackExceptions(
+            waitToFinish, key + " timed out waiting to finish");
         if (waitForException) {
           SkyFunctionEnvironment skyEnv = (SkyFunctionEnvironment) env;
-          TrackingAwaiter.waitAndMaybeThrowInterrupt(skyEnv.getExceptionLatchForTesting(),
-              key + " timed out waiting for exception");
+          TrackingAwaiter.INSTANCE.awaitLatchAndTrackExceptions(
+              skyEnv.getExceptionLatchForTesting(), key + " timed out waiting for exception");
         }
       }
       for (SkyKey dep : deps) {