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 2017/02/27 10:56:30 UTC
svn commit: r1784526 -
/jackrabbit/oak/trunk/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
Author: mduerig
Date: Mon Feb 27 10:56:30 2017
New Revision: 1784526
URL: http://svn.apache.org/viewvc?rev=1784526&view=rev
Log:
OAK-2374: Sporadic test failure of OSGiIT.listBundles on Buildbot
Remove outdated code relating to the old buildbot
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=1784526&r1=1784525&r2=1784526&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 Mon Feb 27 10:56:30 2017
@@ -16,9 +16,7 @@
*/
package org.apache.jackrabbit.oak.osgi;
-import static java.lang.System.getenv;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeTrue;
import static org.ops4j.pax.exam.CoreOptions.bundle;
import static org.ops4j.pax.exam.CoreOptions.frameworkProperty;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
@@ -86,7 +84,6 @@ public class OSGiIT {
@Test
public void bundleStates() {
- assumeTrue(!buildBotTrunkLinux());
for (Bundle bundle : context.getBundles()) {
assertEquals(
String.format("Bundle %s not active. have a look at the logs", bundle.toString()),
@@ -96,18 +93,11 @@ 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