You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2014/12/19 16:59:02 UTC
svn commit: r1646783 -
/jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
Author: mduerig
Date: Fri Dec 19 15:59:02 2014
New Revision: 1646783
URL: http://svn.apache.org/r1646783
Log:
OAK-2374: Sporadic test failure of OSGiIT.listBundles on Buildbot
Inline CIHelper.buildBotTrunkLinux for due to Maven/OSGi issues.
Modified:
jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
Modified: jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java?rev=1646783&r1=1646782&r2=1646783&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java (original)
+++ jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java Fri Dec 19 15:59:02 2014
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.oak.osgi;
+import static java.lang.System.getenv;
+import static org.junit.Assume.assumeTrue;
import static org.ops4j.pax.exam.CoreOptions.bundle;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
@@ -81,11 +83,18 @@ public class OSGiIT {
@Test
public void listBundles() {
+ assumeTrue(!buildBotTrunkLinux()); // FIXME OAK-2374: fails often on http://ci.apache.org/builders/oak-trunk.
for (Bundle bundle : context.getBundles()) {
System.out.println(bundle);
}
}
+ // FIXME this is a copy of CIHelper.buildBotTrunkLinux() due to OSGi/Maven shortcomings. See OAK-2374
+ private static boolean buildBotTrunkLinux() {
+ String user = getenv("USER");
+ return user != null && user.startsWith("buildslave3");
+ }
+
@Test
public void listServices() throws InvalidSyntaxException {
for (ServiceReference reference