You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/03/09 11:45:31 UTC
svn commit: r1665179 - in
/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it:
RoundRobinQueueTest.java UnorderedQueueTest.java
Author: cziegeler
Date: Mon Mar 9 10:45:31 2015
New Revision: 1665179
URL: http://svn.apache.org/r1665179
Log:
Potential fix for the failing test cases in Jenkins
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/RoundRobinQueueTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/UnorderedQueueTest.java
Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/RoundRobinQueueTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/RoundRobinQueueTest.java?rev=1665179&r1=1665178&r2=1665179&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/RoundRobinQueueTest.java (original)
+++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/RoundRobinQueueTest.java Mon Mar 9 10:45:31 2015
@@ -24,8 +24,10 @@ import static org.junit.Assert.assertTru
import java.io.IOException;
import java.util.Dictionary;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Hashtable;
+import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
@@ -120,7 +122,7 @@ public class RoundRobinQueueTest extends
synchronized ( maxParticipants ) {
maxParticipants.add(max);
}
- sleep(30);
+ sleep(job.getProperty("sleep", 30));
parallelCount.decrementAndGet();
return JobResult.OK;
}
@@ -150,7 +152,13 @@ public class RoundRobinQueueTest extends
// we start "some" jobs:
for(int i = 0; i < NUM_JOBS; i++ ) {
final String subTopic = TOPIC + "/sub" + (i % 10);
- jobManager.addJob(subTopic, null);
+ final Map<String, Object> props = new HashMap<String, Object>();
+ if ( i < 10 ) {
+ props.put("sleep", 300);
+ } else {
+ props.put("sleep", 30);
+ }
+ jobManager.addJob(subTopic, props);
}
// start the queue
q.resume();
Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/UnorderedQueueTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/UnorderedQueueTest.java?rev=1665179&r1=1665178&r2=1665179&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/UnorderedQueueTest.java (original)
+++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/UnorderedQueueTest.java Mon Mar 9 10:45:31 2015
@@ -24,8 +24,10 @@ import static org.junit.Assert.assertTru
import java.io.IOException;
import java.util.Dictionary;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Hashtable;
+import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
@@ -120,7 +122,7 @@ public class UnorderedQueueTest extends
synchronized ( maxParticipants ) {
maxParticipants.add(max);
}
- sleep(30);
+ sleep(job.getProperty("sleep", 30));
parallelCount.decrementAndGet();
return JobResult.OK;
}
@@ -150,7 +152,13 @@ public class UnorderedQueueTest extends
// we start "some" jobs:
for(int i = 0; i < NUM_JOBS; i++ ) {
final String subTopic = TOPIC + "/sub" + (i % 10);
- jobManager.addJob(subTopic, null);
+ final Map<String, Object> props = new HashMap<String, Object>();
+ if ( i < 10 ) {
+ props.put("sleep", 300);
+ } else {
+ props.put("sleep", 30);
+ }
+ jobManager.addJob(subTopic, props);
}
// start the queue
q.resume();