Merge branch 'master' of github.com:jenkinsci/jenkins

core/src/main/java/jenkins/model/Jenkins.java

@@ -211,6 +211,9 @@ import org.jvnet.hudson.reactor.TaskBuilder;
 import org.jvnet.hudson.reactor.TaskGraphBuilder;
 import org.jvnet.hudson.reactor.Reactor;
 import org.jvnet.hudson.reactor.TaskGraphBuilder.Handle;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.DoNotUse;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.args4j.Argument;
 import org.kohsuke.args4j.Option;
 import org.kohsuke.stapler.Ancestor;
@@ -636,9 +639,25 @@ public class Jenkins extends AbstractCIBase implements ModifiableItemGroup<TopLe
         }
     };
 
+
+    /**
+     * Hook for a test harness to intercept Jenkins.getInstance()
+     *
+     * Do not use in the production code as the signature may change.
+     */
+    public interface JenkinsHolder {
+        Jenkins getInstance();
+    }
+
+    static JenkinsHolder HOLDER = new JenkinsHolder() {
+        public Jenkins getInstance() {
+            return theInstance;
+        }
+    };
+
     @CLIResolver
     public static Jenkins getInstance() {
-        return theInstance;
+        return HOLDER.getInstance();
     }
 
     /**

test/src/test/java/hudson/UDPBroadcastThreadTest.java

@@ -24,7 +24,7 @@ public class UDPBroadcastThreadTest extends HudsonTestCase {
     public void testLegacy() throws Exception {
         DatagramSocket s = new DatagramSocket();
         sendQueryTo(s, InetAddress.getLocalHost());
-        s.setSoTimeout(5000); // to prevent test hang
+        s.setSoTimeout(15000); // to prevent test hang
         receiveAndVerify(s);
     }
 
@@ -39,7 +39,7 @@ public class UDPBroadcastThreadTest extends HudsonTestCase {
         try {
             DatagramSocket s = new DatagramSocket();
             sendQueryTo(s, UDPBroadcastThread.MULTICAST);
-            s.setSoTimeout(5000); // to prevent test hang
+            s.setSoTimeout(15000); // to prevent test hang
 
             // we should at least get two replies since we run two broadcasts
             receiveAndVerify(s);