You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:49:38 UTC
[34/50] brooklyn-server git commit: Use brooklyn.properties when
creating management context in AbstractJcloudsLocationTest
Use brooklyn.properties when creating management context in AbstractJcloudsLocationTest
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/dfe4c0f4
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/dfe4c0f4
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/dfe4c0f4
Branch: refs/heads/0.6.0
Commit: dfe4c0f4fb1c20bb702d3d83fa3753998af10d54
Parents: 6109dd6
Author: Andrew Kennedy <an...@cloudsoftcorp.com>
Authored: Thu Nov 14 13:39:04 2013 +0000
Committer: Andrew Kennedy <an...@cloudsoftcorp.com>
Committed: Thu Nov 14 15:00:04 2013 +0000
----------------------------------------------------------------------
.../brooklyn/location/jclouds/AbstractJcloudsLocationTest.groovy | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/dfe4c0f4/locations/jclouds/src/test/java/brooklyn/location/jclouds/AbstractJcloudsLocationTest.groovy
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/location/jclouds/AbstractJcloudsLocationTest.groovy b/locations/jclouds/src/test/java/brooklyn/location/jclouds/AbstractJcloudsLocationTest.groovy
index 15f2f60..be699ae 100644
--- a/locations/jclouds/src/test/java/brooklyn/location/jclouds/AbstractJcloudsLocationTest.groovy
+++ b/locations/jclouds/src/test/java/brooklyn/location/jclouds/AbstractJcloudsLocationTest.groovy
@@ -9,6 +9,7 @@ import org.testng.annotations.BeforeMethod
import org.testng.annotations.DataProvider
import org.testng.annotations.Test
+import brooklyn.config.BrooklynProperties;
import brooklyn.entity.basic.Entities
import brooklyn.location.basic.SshMachineLocation
import brooklyn.management.ManagementContext
@@ -59,7 +60,8 @@ public abstract class AbstractJcloudsLocationTest {
@BeforeMethod(alwaysRun=true)
public void setUp() {
- ctx = Entities.newManagementContext(ImmutableMap.of("provider", provider));
+ BrooklynProperties props = BrooklynProperties.Factory.newDefault().addFromMap(ImmutableMap.of("provider", provider))
+ ctx = Entities.newManagementContext(props);
}
@AfterMethod(alwaysRun=true)