From 69f52c1b8a7578b351073221a77de82635f143ce Mon Sep 17 00:00:00 2001
From: Mike Hearn <hearn@google.com>
Date: Tue, 10 Dec 2013 13:51:18 -0800
Subject: [PATCH] Bug fix to avoid a flake in PeerTest.

There seem to be other cases where unit tests can be flaky with nonetty. More fixes will come later.
---
 core/src/test/java/com/google/bitcoin/core/PeerTest.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/test/java/com/google/bitcoin/core/PeerTest.java b/core/src/test/java/com/google/bitcoin/core/PeerTest.java
index 6769a3e7..f93f73ec 100644
--- a/core/src/test/java/com/google/bitcoin/core/PeerTest.java
+++ b/core/src/test/java/com/google/bitcoin/core/PeerTest.java
@@ -799,8 +799,10 @@ public class PeerTest extends TestWithNetworkConnections {
             }
         });
         connectWithVersion(500);
-        connectedFuture.get();
-        disconnectedFuture.get();
+        // We must wait uninterruptibly here because connect[WithVersion] generates a peer that interrupts the current
+        // thread when it disconnects.
+        Uninterruptibles.getUninterruptibly(connectedFuture);
+        Uninterruptibles.getUninterruptibly(disconnectedFuture);
         try {
             peer.writeTarget.writeBytes(new byte[1]);
             fail();