mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 13:32:24 +00:00
Merge commit 'ff05abe46211613237191330b3afa04325bb5c12'
Conflicts: test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
This commit is contained in:
commit
5bbc78f6d8
3 files changed
+88
-2
No files matched your search
@@ -33,6 +33,7 @@ import hudson.Extension;
|
||||
import hudson.ExtensionList;
|
||||
import hudson.FilePath;
|
||||
import hudson.Functions;
|
||||
import hudson.Functions.ThreadGroupMap;
|
||||
import hudson.Launcher;
|
||||
import hudson.Launcher.LocalLauncher;
|
||||
import hudson.Main;
|
||||
@@ -108,6 +109,7 @@ import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.lang.annotation.Annotation;
|
||||
import java.lang.management.ThreadInfo;
|
||||
import java.lang.ref.WeakReference;
|
||||
import java.lang.reflect.Array;
|
||||
import java.lang.reflect.Constructor;
|
||||
@@ -130,7 +132,12 @@ import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.Callable;
|
||||
import java.util.concurrent.CountDownLatch;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.Future;
|
||||
import java.util.concurrent.SynchronousQueue;
|
||||
import java.util.concurrent.ThreadFactory;
|
||||
import java.util.concurrent.ThreadPoolExecutor;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.jar.Manifest;
|
||||
import java.util.logging.Filter;
|
||||
import java.util.logging.Level;
|
||||
@@ -383,9 +390,28 @@ public abstract class HudsonTestCase extends TestCase implements RootAction {
|
||||
System.out.println("=== Starting "+ getClass().getSimpleName() + "." + getName());
|
||||
// so that test code has all the access to the system
|
||||
SecurityContextHolder.getContext().setAuthentication(ACL.SYSTEM);
|
||||
super.runTest();
|
||||
|
||||
try {
|
||||
super.runTest();
|
||||
} catch (Throwable t) {
|
||||
// allow the late attachment of a debugger in case of a failure. Useful
|
||||
// for diagnosing a rare failure
|
||||
try {
|
||||
throw new BreakException();
|
||||
} catch (BreakException e) {}
|
||||
|
||||
// dump threads
|
||||
ThreadInfo[] threadInfos = Functions.getThreadInfos();
|
||||
ThreadGroupMap m = Functions.sortThreadsAndGetGroupMap(threadInfos);
|
||||
for (ThreadInfo ti : threadInfos) {
|
||||
System.err.println(Functions.dumpThreadInfo(ti, m));
|
||||
}
|
||||
throw t;
|
||||
}
|
||||
}
|
||||
|
||||
public static class BreakException extends Exception {}
|
||||
|
||||
public String getIconFileName() {
|
||||
return null;
|
||||
}
|
||||
@@ -425,6 +451,13 @@ public abstract class HudsonTestCase extends TestCase implements RootAction {
|
||||
SocketConnector connector = new SocketConnector();
|
||||
connector.setHeaderBufferSize(12*1024); // use a bigger buffer as Stapler traces can get pretty large on deeply nested URL
|
||||
|
||||
server.setThreadPool(new ThreadPoolImpl(new ThreadPoolExecutor(1, 10, 10L, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(),new ThreadFactory() {
|
||||
public Thread newThread(Runnable r) {
|
||||
Thread t = new Thread(r);
|
||||
t.setName("Jetty Thread Pool");
|
||||
return t;
|
||||
}
|
||||
})));
|
||||
server.addConnector(connector);
|
||||
server.addUserRealm(configureUserRealm());
|
||||
server.start();
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
package org.jvnet.hudson.test;
|
||||
|
||||
import org.mortbay.component.AbstractLifeCycle;
|
||||
import org.mortbay.thread.ThreadPool;
|
||||
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/**
|
||||
* @author Kohsuke Kawaguchi
|
||||
*/
|
||||
public class ThreadPoolImpl extends AbstractLifeCycle implements ThreadPool {
|
||||
private final ExecutorService es;
|
||||
|
||||
public ThreadPoolImpl(ExecutorService es) {
|
||||
this.es = es;
|
||||
}
|
||||
|
||||
public boolean dispatch(Runnable job) {
|
||||
if (!isRunning() || job==null)
|
||||
return false;
|
||||
|
||||
es.submit(job);
|
||||
return true;
|
||||
}
|
||||
|
||||
public void join() throws InterruptedException {
|
||||
while(!es.awaitTermination(999, TimeUnit.DAYS))
|
||||
;
|
||||
}
|
||||
|
||||
public int getThreads() {
|
||||
return 999;
|
||||
}
|
||||
|
||||
public int getIdleThreads() {
|
||||
return 999;
|
||||
}
|
||||
|
||||
public boolean isLowOnThreads() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doStart() throws Exception {
|
||||
// noop
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doStop() throws Exception {
|
||||
es.shutdown();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user