Repository: karaf Updated Branches: refs/heads/master 1e0631669 -> 4191f2d44
Ignoring these tests for the moment as they seem to influence the other tests Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/4191f2d4 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/4191f2d4 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/4191f2d4 Branch: refs/heads/master Commit: 4191f2d447e6b681b06fdd126517500c25063d74 Parents: 1e06316 Author: Christian Schneider <[email protected]> Authored: Thu May 18 12:05:31 2017 +0200 Committer: Christian Schneider <[email protected]> Committed: Thu May 18 12:05:31 2017 +0200 ---------------------------------------------------------------------- .../itests/mavenresolver/KarafMinimalMonitoredTestSupport.java | 2 +- .../MavenResolverRegisteredBeforeConfigAdminTest.java | 2 ++ .../MavenResolverRegisteredOnlyAfterConfigAdminTest.java | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/4191f2d4/itests/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java b/itests/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java index 0a67fc1..6289522 100644 --- a/itests/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java +++ b/itests/src/test/java/org/apache/karaf/itests/mavenresolver/KarafMinimalMonitoredTestSupport.java @@ -61,7 +61,7 @@ public abstract class KarafMinimalMonitoredTestSupport { @Inject protected ServiceMonitor serviceMonitor; - @ProbeBuilder + //@ProbeBuilder public TestProbeBuilder probeConfiguration(TestProbeBuilder probe) { probe.setHeader(Constants.IMPORT_PACKAGE, ServiceMonitor.class.getPackage().getName()); return probe; http://git-wip-us.apache.org/repos/asf/karaf/blob/4191f2d4/itests/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredBeforeConfigAdminTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredBeforeConfigAdminTest.java b/itests/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredBeforeConfigAdminTest.java index 67fe43d..ae8d5e0 100644 --- a/itests/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredBeforeConfigAdminTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredBeforeConfigAdminTest.java @@ -23,6 +23,7 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.replaceCo import java.io.File; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Configuration; @@ -53,6 +54,7 @@ public class MavenResolverRegisteredBeforeConfigAdminTest extends KarafMinimalMo }; } + @Ignore @Test public void mavenResolverAvailable() throws Exception { long count = numberOfServiceEventsFor("org.ops4j.pax.url.mvn.MavenResolver"); http://git-wip-us.apache.org/repos/asf/karaf/blob/4191f2d4/itests/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java b/itests/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java index ac83196..0d8928f 100644 --- a/itests/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/mavenresolver/MavenResolverRegisteredOnlyAfterConfigAdminTest.java @@ -23,6 +23,7 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfi import java.io.File; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Configuration; @@ -55,6 +56,7 @@ public class MavenResolverRegisteredOnlyAfterConfigAdminTest extends KarafMinima }; } + @Ignore @Test public void mavenResolverAvailable() throws Exception { long count = numberOfServiceEventsFor("org.ops4j.pax.url.mvn.MavenResolver");
