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

This commit is contained in:
Jesse Glick committed 2012-12-10 12:35:47 -05:00
commit 46c170c9b1
171 files changed
+825 -3318

No files matched your search

@@ -24,6 +24,7 @@
*/
package org.jvnet.hudson.test;
import com.gargoylesoftware.htmlunit.AlertHandler;
import com.gargoylesoftware.htmlunit.html.HtmlImage;
import com.google.inject.Injector;
import hudson.ClassicPluginStrategy;
@@ -1659,6 +1660,12 @@ public abstract class HudsonTestCase extends TestCase implements RootAction {
}
});
setAlertHandler(new AlertHandler() {
public void handleAlert(Page page, String message) {
throw new AssertionError("Alert dialog poped up: "+message);
}
});
// avoid a hang by setting a time out. It should be long enough to prevent
// false-positive timeout on slow systems
setTimeout(60*1000);