MySql: test that creationScriptContents is template Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6f0d412a Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6f0d412a Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6f0d412a
Branch: refs/heads/master Commit: 6f0d412a7a39146ca7ff62f443c9d29e5d33eaf5 Parents: a3f8257 Author: Aled Sage <[email protected]> Authored: Tue Mar 3 16:30:36 2015 +0000 Committer: Aled Sage <[email protected]> Committed: Tue Mar 3 16:30:36 2015 +0000 ---------------------------------------------------------------------- .../entity/database/mysql/MySqlIntegrationTest.java | 10 ++++++---- .../entity/database/mysql/MySqlLiveRackspaceTest.java | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6f0d412a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlIntegrationTest.java index d5d0fed..67397d1 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlIntegrationTest.java @@ -49,7 +49,8 @@ public class MySqlIntegrationTest extends BrooklynAppLiveTestSupport { // can start in AWS by running this -- or use brooklyn CLI/REST for most clouds, or programmatic/config for set of fixed IP machines static String hostname = Networking.getLocalHost().getHostName(); - //from http://www.vogella.de/articles/MySQLJava/article.html + // From http://www.vogella.de/articles/MySQLJava/article.html + // Expects COMMENTS to be injected as the test.table.name config value, for VogellaExampleAccess to work. public static final String CREATION_SCRIPT = Joiner.on("\n").join(ImmutableList.of( "CREATE DATABASE feedback;", "CREATE USER 'sqluser'@'localhost' IDENTIFIED BY 'sqluserpw';", @@ -63,7 +64,7 @@ public class MySqlIntegrationTest extends BrooklynAppLiveTestSupport { "GRANT ALL PRIVILEGES ON feedback.* TO 'sqluser'@'$hostname';", "FLUSH PRIVILEGES;", "USE feedback;", - "CREATE TABLE COMMENTS (", + "CREATE TABLE ${config['test.table.name']} (", " id INT NOT NULL AUTO_INCREMENT,", " MYUSER VARCHAR(30) NOT NULL,", " EMAIL VARCHAR(30), ", @@ -74,7 +75,7 @@ public class MySqlIntegrationTest extends BrooklynAppLiveTestSupport { " PRIMARY KEY (ID)", " );", "", - "INSERT INTO COMMENTS values (default, 'lars', '[email protected]','http://www.vogella.de', '2009-09-14 10:33:11', 'Summary','My first comment' );" + "INSERT INTO ${config['test.table.name']} values (default, 'lars', '[email protected]','http://www.vogella.de', '2009-09-14 10:33:11', 'Summary','My first comment' );" )); @Test(groups = {"Integration"}) @@ -84,7 +85,8 @@ public class MySqlIntegrationTest extends BrooklynAppLiveTestSupport { MySqlNode mysql = app.createAndManageChild(EntitySpec.create(MySqlNode.class) .configure("mysql.server.conf", MutableMap.of("skip-name-resolve","")) .configure("creationScriptContents", CREATION_SCRIPT) - .configure("dataDir", dataDir.getAbsolutePath())); + .configure("dataDir", dataDir.getAbsolutePath()) + .configure("test.table.name", "COMMENTS")); // to ensure creation script is templated LocalhostMachineProvisioningLocation location = new LocalhostMachineProvisioningLocation(); app.start(ImmutableList.of(location));; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6f0d412a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java index 6ec40bb..8fdf558 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java @@ -80,7 +80,7 @@ public class MySqlLiveRackspaceTest extends MySqlIntegrationTest { test("Red Hat Enterprise Linux 6"); } - @Test(groups = {"Live"}) + @Test(enabled=false, groups = {"Live"}) // only run this in MySqlIntegrationTest public void test_localhost() throws Exception { super.test_localhost(); }
