From 2e47359a6e14d19cf0795b36fc92ff3c0faf5cf6 Mon Sep 17 00:00:00 2001 From: Jerome Lacoste Date: Sat, 5 Feb 2011 13:45:44 +0100 Subject: [PATCH] JENKINS-8702 unit tests improvements hudson.UDPBroadcastThread#testMulticast hangs when the network isn't enabled on my Linux box: joinGroup throws IOException and the ready lock isn't released. This ready lock is only used in the tests. --- core/src/main/java/hudson/UDPBroadcastThread.java | 5 ++++- test/src/test/java/hudson/UDPBroadcastThreadTest.java | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/UDPBroadcastThread.java b/core/src/main/java/hudson/UDPBroadcastThread.java index bb1e3e8965..dbc0d1719b 100644 --- a/core/src/main/java/hudson/UDPBroadcastThread.java +++ b/core/src/main/java/hudson/UDPBroadcastThread.java @@ -61,10 +61,13 @@ public class UDPBroadcastThread extends Thread { @Override public void run() { try { + try{ mcs.joinGroup(MULTICAST); + } finally{ ready.signal(); + } - while(true) { + while(true) { byte[] buf = new byte[2048]; DatagramPacket p = new DatagramPacket(buf,buf.length); mcs.receive(p); diff --git a/test/src/test/java/hudson/UDPBroadcastThreadTest.java b/test/src/test/java/hudson/UDPBroadcastThreadTest.java index 239fd2d3a5..9299e64e55 100644 --- a/test/src/test/java/hudson/UDPBroadcastThreadTest.java +++ b/test/src/test/java/hudson/UDPBroadcastThreadTest.java @@ -17,6 +17,8 @@ import java.io.IOException; * @author Kohsuke Kawaguchi */ public class UDPBroadcastThreadTest extends HudsonTestCase { + // FIXME these tests will fail if don't have a network link + /** * Old unicast based clients should still be able to receive some reply, * as we haven't changed the port.