Fixing Integration test - MySQL tests Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d0f5e0a4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d0f5e0a4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d0f5e0a4
Branch: refs/heads/master Commit: d0f5e0a4149fc648f6a3b964e94f12049f991c42 Parents: f8e6f16 Author: Yavor Yanchev <[email protected]> Authored: Wed Jun 24 18:17:18 2015 +0300 Committer: Yavor Yanchev <[email protected]> Committed: Wed Jun 24 18:17:18 2015 +0300 ---------------------------------------------------------------------- .../java/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java | 3 ++- .../java/brooklyn/entity/database/mysql/MySqlLiveGceTest.java | 3 ++- .../brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java | 3 ++- .../java/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f5e0a4/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java index 0e39c50..4bd46c2 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java +++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveEc2Test.java @@ -34,7 +34,8 @@ public class MySqlLiveEc2Test extends AbstractEc2LiveTest { @Override protected void doTest(Location loc) throws Exception { MySqlNode mysql = app.createAndManageChild(EntitySpec.create(MySqlNode.class) - .configure(DatastoreCommon.CREATION_SCRIPT_CONTENTS, MySqlIntegrationTest.CREATION_SCRIPT)); + .configure(DatastoreCommon.CREATION_SCRIPT_CONTENTS, MySqlIntegrationTest.CREATION_SCRIPT) + .configure("test.table.name", "COMMENTS")); app.start(ImmutableList.of(loc)); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f5e0a4/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveGceTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveGceTest.java b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveGceTest.java index 0cc20ef..9d2b48c 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveGceTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlLiveGceTest.java @@ -34,7 +34,8 @@ public class MySqlLiveGceTest extends AbstractGoogleComputeLiveTest { @Override protected void doTest(Location loc) throws Exception { MySqlNode mysql = app.createAndManageChild(EntitySpec.create(MySqlNode.class) - .configure(DatastoreCommon.CREATION_SCRIPT_CONTENTS, MySqlIntegrationTest.CREATION_SCRIPT)); + .configure(DatastoreCommon.CREATION_SCRIPT_CONTENTS, MySqlIntegrationTest.CREATION_SCRIPT) + .configure("test.table.name", "COMMENTS")); app.start(ImmutableList.of(loc)); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f5e0a4/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 8fdf558..d8cdd64 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 @@ -87,7 +87,8 @@ public class MySqlLiveRackspaceTest extends MySqlIntegrationTest { public void test(String osRegex) throws Exception { MySqlNode mysql = app.createAndManageChild(EntitySpec.create(MySqlNode.class) - .configure(DatastoreCommon.CREATION_SCRIPT_CONTENTS, CREATION_SCRIPT)); + .configure(DatastoreCommon.CREATION_SCRIPT_CONTENTS, CREATION_SCRIPT) + .configure("test.table.name", "COMMENTS")); BrooklynProperties brooklynProperties = mgmt.getBrooklynProperties(); brooklynProperties.put("brooklyn.location.jclouds.rackspace-cloudservers-uk.imageNameRegex", osRegex); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d0f5e0a4/software/database/src/test/java/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java b/software/database/src/test/java/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java index b1df1d2..0abebbb 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MysqlDockerLiveTest.java @@ -33,7 +33,8 @@ public class MysqlDockerLiveTest extends AbstractDockerLiveTest { @Override protected void doTest(Location loc) throws Exception { MySqlNode mysql = app.createAndManageChild(EntitySpec.create(MySqlNode.class) - .configure(DatastoreCommon.CREATION_SCRIPT_CONTENTS, MySqlIntegrationTest.CREATION_SCRIPT)); + .configure(DatastoreCommon.CREATION_SCRIPT_CONTENTS, MySqlIntegrationTest.CREATION_SCRIPT) + .configure("test.table.name", "COMMENTS")); app.start(ImmutableList.of(loc));
