Skip to content
Permalink
Browse files

[JENKINS-25326] - Enable folder tests created by @ikedam

  • Loading branch information...
oleg-nenashev committed Apr 10, 2016
1 parent 5f3a9bb commit dfb3d2f13c139c430648556ece1f6b67d016dedb
Showing with 12 additions and 10 deletions.
  1. +7 −7 pom.xml
  2. +5 −3 src/test/java/hudson/plugins/throttleconcurrents/ThrottleIntegrationTest.java
14 pom.xml
@@ -129,19 +129,19 @@ THE SOFTWARE.
<version>2.0.1</version>
<type>jar</type>
</dependency>
<!-- Requires core 1.480.3
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-project</artifactId>
<version>1.4.1</version>
</dependency>

<!-- Dependencies for test -->
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>cloudbees-folder</artifactId>
<version>4.0</version>
<scope>test</scope>
</dependency>
-->
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-project</artifactId>
<version>1.4.1</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
@@ -24,6 +24,7 @@

package hudson.plugins.throttleconcurrents;

import com.cloudbees.hudson.plugins.folder.Folder;
import hudson.EnvVars;
import hudson.model.FreeStyleProject;
import hudson.model.Node.Mode;
@@ -170,8 +171,6 @@ 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();
@@ -198,6 +197,8 @@ public void testThrottlingWithCategoryInFolder() throws Exception {
Arrays.asList(category), // categories
true, // throttleEnabled
"category", // throttleOption
false, // limitOneJobWithMatchingParams
null, // paramsToUse for the previous flag
ThrottleMatrixProjectOptions.DEFAULT
));
p1.getBuildersList().add(new SleepBuilder(SLEEP_TIME));
@@ -211,6 +212,8 @@ public void testThrottlingWithCategoryInFolder() throws Exception {
Arrays.asList(category), // categories
true, // throttleEnabled
"category", // throttleOption
false, // limitOneJobWithMatchingParams
null, // paramsToUse for the previous flag
ThrottleMatrixProjectOptions.DEFAULT
));
p2.getBuildersList().add(new SleepBuilder(SLEEP_TIME));
@@ -223,5 +226,4 @@ public void testThrottlingWithCategoryInFolder() throws Exception {
// throttled, and only one build runs at the same time.
assertEquals(1, waterMark.getExecutorWaterMark());
}
*/
}

0 comments on commit dfb3d2f

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