You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/05/28 18:05:26 UTC
[10/21] git commit: Remove Chef references in PostgreSqlSaltLiveTest
Remove Chef references in PostgreSqlSaltLiveTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4828b16f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4828b16f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4828b16f
Branch: refs/heads/master
Commit: 4828b16f6f7becad4256e5ae2ab2dc8736e137d5
Parents: 042d40f
Author: Andrew Kennedy <an...@cloudsoftcorp.com>
Authored: Wed Oct 23 15:25:58 2013 +0100
Committer: Andrew Kennedy <an...@cloudsoftcorp.com>
Committed: Wed May 28 15:14:04 2014 +0100
----------------------------------------------------------------------
.../entity/database/postgresql/PostgreSqlSaltLiveTest.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4828b16f/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java
----------------------------------------------------------------------
diff --git a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java
index 89a3c11..741b814 100644
--- a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java
+++ b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java
@@ -8,7 +8,6 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import brooklyn.entity.basic.Entities;
-import brooklyn.entity.chef.ChefLiveTestSupport;
import brooklyn.entity.database.VogellaExampleAccess;
import brooklyn.entity.effector.EffectorTasks;
import brooklyn.entity.salt.SaltLiveTestSupport;
@@ -56,9 +55,9 @@ public class PostgreSqlSaltLiveTest extends SaltLiveTestSupport {
@Test(groups="Live")
public void testPostgresScriptAndAccess() throws Exception {
- ChefLiveTestSupport.installBrooklynChefHostedConfig(app);
+ SaltLiveTestSupport.createLocation(mgmt);
PortRange randomPort = PortRanges.fromString(""+(5420+new Random().nextInt(10))+"+");
- psql = app.createAndManageChild(PostgreSqlSpecs.specChef()
+ psql = app.createAndManageChild(PostgreSqlSpecs.specSalt()
.configure(PostgreSqlNode.CREATION_SCRIPT_CONTENTS, PostgreSqlIntegrationTest.CREATION_SCRIPT)
.configure(PostgreSqlNode.POSTGRESQL_PORT, randomPort)
);