Repository: brooklyn-server Updated Branches: refs/heads/master 215682944 -> c3dc6e847
Fix AssemblyTest (increase timeout for FeaturesService) Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/da8a3d59 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/da8a3d59 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/da8a3d59 Branch: refs/heads/master Commit: da8a3d59d7bed23a71a30f4660fb7ffb3e31580a Parents: 2156829 Author: Aled Sage <[email protected]> Authored: Sat Jul 9 09:53:57 2016 +0100 Committer: Aled Sage <[email protected]> Committed: Sat Jul 9 09:53:57 2016 +0100 ---------------------------------------------------------------------- karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java | 1 + .../brooklyn/core/catalog/internal/CatalogBomScannerTest.java | 3 +++ .../apache/brooklyn/core/catalog/internal/DefaultBomLoadTest.java | 1 + .../java/org/apache/brooklyn/launcher/osgi/OsgiLauncherTest.java | 2 ++ .../org/apache/brooklyn/security/CustomSecurityProviderTest.java | 3 +++ .../org/apache/brooklyn/security/StockSecurityProviderTest.java | 3 +++ 6 files changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/da8a3d59/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java ---------------------------------------------------------------------- diff --git a/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java b/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java index 398a374..14ec1d2 100644 --- a/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java +++ b/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java @@ -49,6 +49,7 @@ public class AssemblyTest { private BundleContext bc; @Inject + @Filter(timeout = 120000) protected FeaturesService featuresService; /** http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/da8a3d59/karaf/itest/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogBomScannerTest.java ---------------------------------------------------------------------- diff --git a/karaf/itest/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogBomScannerTest.java b/karaf/itest/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogBomScannerTest.java index baf92f4..39f959c 100644 --- a/karaf/itest/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogBomScannerTest.java +++ b/karaf/itest/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogBomScannerTest.java @@ -60,12 +60,15 @@ public class CatalogBomScannerTest { public static final String KARAF_INIT_BLUEPRINT_BOMSCANNER_PID = "org.apache.brooklyn.core.catalog.bomscanner"; @Inject + @Filter(timeout = 120000) protected FeaturesService featuresService; @Inject + @Filter(timeout = 120000) protected ConfigurationAdmin configAdmin; @Inject + @Filter(timeout = 120000) protected ManagementContext managementContext; /** http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/da8a3d59/karaf/itest/src/test/java/org/apache/brooklyn/core/catalog/internal/DefaultBomLoadTest.java ---------------------------------------------------------------------- diff --git a/karaf/itest/src/test/java/org/apache/brooklyn/core/catalog/internal/DefaultBomLoadTest.java b/karaf/itest/src/test/java/org/apache/brooklyn/core/catalog/internal/DefaultBomLoadTest.java index 13c008e..31d500e 100644 --- a/karaf/itest/src/test/java/org/apache/brooklyn/core/catalog/internal/DefaultBomLoadTest.java +++ b/karaf/itest/src/test/java/org/apache/brooklyn/core/catalog/internal/DefaultBomLoadTest.java @@ -53,6 +53,7 @@ public class DefaultBomLoadTest { BootFinished bootFinished; @Inject + @Filter(timeout = 120000) protected ManagementContext managementContext; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/da8a3d59/karaf/itest/src/test/java/org/apache/brooklyn/launcher/osgi/OsgiLauncherTest.java ---------------------------------------------------------------------- diff --git a/karaf/itest/src/test/java/org/apache/brooklyn/launcher/osgi/OsgiLauncherTest.java b/karaf/itest/src/test/java/org/apache/brooklyn/launcher/osgi/OsgiLauncherTest.java index eecd558..b825112 100644 --- a/karaf/itest/src/test/java/org/apache/brooklyn/launcher/osgi/OsgiLauncherTest.java +++ b/karaf/itest/src/test/java/org/apache/brooklyn/launcher/osgi/OsgiLauncherTest.java @@ -55,9 +55,11 @@ public class OsgiLauncherTest { private static final String TEST_KEY_IN_CFG = "test.key.in.cfg"; @Inject + @Filter(timeout = 120000) protected ManagementContext mgmt; @Inject + @Filter(timeout = 120000) protected ConfigurationAdmin configAdmin; /** http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/da8a3d59/karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProviderTest.java ---------------------------------------------------------------------- diff --git a/karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProviderTest.java b/karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProviderTest.java index a436ac4..3856c80 100644 --- a/karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProviderTest.java +++ b/karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProviderTest.java @@ -53,6 +53,7 @@ import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; +import org.ops4j.pax.exam.util.Filter; import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Constants; @@ -69,9 +70,11 @@ public class CustomSecurityProviderTest { * installed */ @Inject + @Filter(timeout = 120000) BootFinished bootFinished; @Inject + @Filter(timeout = 120000) ManagementContext managementContext; @Configuration http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/da8a3d59/karaf/itest/src/test/java/org/apache/brooklyn/security/StockSecurityProviderTest.java ---------------------------------------------------------------------- diff --git a/karaf/itest/src/test/java/org/apache/brooklyn/security/StockSecurityProviderTest.java b/karaf/itest/src/test/java/org/apache/brooklyn/security/StockSecurityProviderTest.java index 9be9e7d..8ef5ceb 100644 --- a/karaf/itest/src/test/java/org/apache/brooklyn/security/StockSecurityProviderTest.java +++ b/karaf/itest/src/test/java/org/apache/brooklyn/security/StockSecurityProviderTest.java @@ -62,6 +62,7 @@ import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; +import org.ops4j.pax.exam.util.Filter; @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) @@ -77,9 +78,11 @@ public class StockSecurityProviderTest { * installed */ @Inject + @Filter(timeout = 120000) BootFinished bootFinished; @Inject + @Filter(timeout = 120000) ManagementContext managementContext; @Configuration
