Skip to content
Permalink
Browse files

[JENKINS-25326] Reverted changes required for the test to reproduce J…

…ENKINS-25326.
  • Loading branch information...
ikedam committed Feb 21, 2016
1 parent 0923414 commit 5b5728a069df14df1ce48377682b74ed338605df
Showing with 8 additions and 2 deletions.
  1. +3 −2 pom.xml
  2. +5 −0 src/test/java/hudson/plugins/throttleconcurrents/ThrottleIntegrationTest.java
@@ -26,7 +26,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.554</version>
<version>1.424</version>
</parent>

<artifactId>throttle-concurrents</artifactId>
@@ -113,7 +113,7 @@ THE SOFTWARE.
<version>2.0.1</version>
<type>jar</type>
</dependency>
<!-- Requires core 1.480.3 -->
<!-- Requires core 1.480.3
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>cloudbees-folder</artifactId>
@@ -126,6 +126,7 @@ THE SOFTWARE.
<version>1.9.4</version>
<scope>test</scope>
</dependency>
-->
</dependencies>
</project>

@@ -42,7 +42,9 @@
import org.jvnet.hudson.test.HudsonTestCase;
import org.jvnet.hudson.test.SleepBuilder;

/*
import com.cloudbees.hudson.plugins.folder.Folder;
*/

/**
* Tests that {@link ThrottleJobProperty} actually works for builds.
@@ -164,6 +166,8 @@ public void testThrottlingWithCategory() throws Exception {
assertEquals(1, waterMark.getExecutorWaterMark());
}

/*
// Requires Jenkins >= 1.480.3 and cloudbees-folder-plugin
@Bug(25326)
public void testThrottlingWithCategoryInFolder() throws Exception {
setupSlave();
@@ -215,4 +219,5 @@ public void testThrottlingWithCategoryInFolder() throws Exception {
// throttled, and only one build runs at the same time.
assertEquals(1, waterMark.getExecutorWaterMark());
}
*/
}

0 comments on commit 5b5728a

Please sign in to comment.
You can’t perform that action at this time.