Author: cziegeler
Date: Tue Jul 9 08:19:39 2013
New Revision: 1501122
URL: http://svn.apache.org/r1501122
Log:
SLING-2954 : Event ITs spuriosly fail on Jenkins
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java?rev=1501122&r1=1501121&r2=1501122&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Tue Jul 9 08:19:39 2013
@@ -27,6 +27,7 @@ import static org.ops4j.pax.exam.CoreOpt
import java.io.File;
import java.io.IOException;
+import java.net.ServerSocket;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -61,6 +62,18 @@ public abstract class AbstractJobHandlin
@Inject
protected BundleContext bc;
+ private static synchronized int getNextAvailablePort() {
+ try {
+ final ServerSocket socket = new ServerSocket( 0 );
+ final int unusedPort = socket.getLocalPort();
+ socket.close();
+
+ return unusedPort;
+ } catch (final IOException ioe) {
+ throw new IllegalArgumentException(ioe);
+ }
+ }
+
@Configuration
public Option[] config() {
final String bundleFileName = System.getProperty( BUNDLE_JAR_SYS_PROP
);
@@ -76,6 +89,7 @@ public abstract class AbstractJobHandlin
when( localRepo.length() > 0 ).useOptions(
systemProperty("org.ops4j.pax.url.mvn.localRepository").value(localRepo)
),
+
systemProperty("org.osgi.service.http.port").value(String.valueOf(getNextAvailablePort())),
mavenBundle("org.apache.sling",
"org.apache.sling.fragment.xml", "1.0.2"),
mavenBundle("org.apache.sling",
"org.apache.sling.fragment.transaction", "1.0.0"),
mavenBundle("org.apache.sling",
"org.apache.sling.fragment.activation", "1.0.2"),