merged back the RC branch

This commit is contained in:
Kohsuke Kawaguchi committed 2012-08-29 10:03:33 -07:00
commit c3f002cede
3 files changed
+20 -3

No files matched your search

+4 -2
View File
@@ -74,7 +74,10 @@ Upcoming changes</a>
<!-- these changes are controlled by the release process. DO NOT MODIFY -->
<div id="rc" style="display:none;"><!--=BEGIN=-->
<h3><a name=v1.479>What's new in 1.479</a> <!--=DATE=--></h3>
<h3><a name=v1.480>What's new in 1.480</a> <!--=DATE=--></h3>
<!--=RC-CHANGES=-->
</div><!--=END=-->
<h3><a name=v1.479>What's new in 1.479</a> (2012/08/29)</h3>
<ul class=image>
<li class=bug>
"Ping-pong" builds store excessively large <code>CauseAction</code>.
@@ -97,7 +100,6 @@ Upcoming changes</a>
Parameter values disappear if user is not logged in
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-7894">issue 7894</a>)
</ul>
</div><!--=END=-->
<h3><a name=v1.478>What's new in 1.478</a> (2012/08/20)</h3>
<ul class=image>
<li class='major bug'>
+6
View File
@@ -1,3 +1,9 @@
jenkins (1.479) unstable; urgency=low
* See http://jenkins-ci.org/changelog for more details.
-- Kohsuke Kawaguchi <kk@kohsuke.org> Wed, 29 Aug 2012 09:45:34 -0700
jenkins (1.478) unstable; urgency=low
* See http://jenkins-ci.org/changelog for more details.
@@ -132,9 +132,11 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.hamcrest.Matchers;
import org.junit.rules.MethodRule;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.FrameworkMethod;
import org.junit.runners.model.Statement;
import org.jvnet.hudson.test.recipes.Recipe;
import org.jvnet.hudson.test.rhino.JavaScriptDebugger;
@@ -220,7 +222,7 @@ import static org.junit.matchers.JUnitMatchers.containsString;
* @author Stephen Connolly
* @since 1.436
*/
public class JenkinsRule implements TestRule, RootAction {
public class JenkinsRule implements TestRule, MethodRule, RootAction {
private final TestEnvironment env = new TestEnvironment(null);
@@ -445,6 +447,13 @@ public class JenkinsRule implements TestRule, RootAction {
}
}
/**
* Backward compatibility with JUnit 4.8.
*/
public Statement apply(Statement base, FrameworkMethod method, Object target) {
return apply(base,Description.createTestDescription(method.getMethod().getDeclaringClass(), method.getName(), method.getAnnotations()));
}
public Statement apply(final Statement base, final Description description) {
if (description.getAnnotation(WithoutJenkins.class) != null) {
// request has been made to not create the instance for this test method