You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2014/11/06 16:00:56 UTC
[1/2] git commit: fix for TomcatServerSoftlayerLiveTest
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 496052c28 -> 7804628d2
fix for TomcatServerSoftlayerLiveTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/48ecea0f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/48ecea0f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/48ecea0f
Branch: refs/heads/master
Commit: 48ecea0fadb4ae98c76ca4ae65a13540e21b6399
Parents: 94db5ff
Author: Andrea Turli <an...@gmail.com>
Authored: Thu Nov 6 14:56:03 2014 +0100
Committer: Andrea Turli <an...@gmail.com>
Committed: Thu Nov 6 14:56:03 2014 +0100
----------------------------------------------------------------------
.../java/brooklyn/entity/AbstractSoftlayerLiveTest.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48ecea0f/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java
index 8fd7a90..1ca1ad5 100644
--- a/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java
+++ b/software/base/src/test/java/brooklyn/entity/AbstractSoftlayerLiveTest.java
@@ -37,6 +37,8 @@ import brooklyn.management.ManagementContext;
import brooklyn.management.internal.LocalManagementContext;
import brooklyn.test.entity.TestApplication;
import brooklyn.util.collections.MutableMap;
+import brooklyn.util.text.StringShortener;
+import brooklyn.util.text.Strings;
/**
* Runs a test with many different distros and versions.
@@ -44,6 +46,8 @@ import brooklyn.util.collections.MutableMap;
public abstract class AbstractSoftlayerLiveTest {
public static final String PROVIDER = "softlayer";
+ public static final int MAX_TAG_LENGTH = 20;
+ public static final int MAX_VM_NAME_LENGTH = 30;
protected BrooklynProperties brooklynProperties;
protected ManagementContext ctx;
@@ -96,9 +100,11 @@ public abstract class AbstractSoftlayerLiveTest {
}
protected void runTest(Map<String,?> flags) throws Exception {
+ StringShortener shortener = Strings.shortener().separator("-");
+ shortener.canTruncate(getClass().getSimpleName(), MAX_TAG_LENGTH);
Map<String,?> allFlags = MutableMap.<String,Object>builder()
- .put("tags", ImmutableList.of(getClass().getName()))
- .put("vmNameMaxLength", 30)
+ .put("tags", ImmutableList.of(shortener.getStringOfMaxLength(MAX_TAG_LENGTH)))
+ .put("vmNameMaxLength", MAX_VM_NAME_LENGTH)
.putAll(flags)
.build();
jcloudsLocation = ctx.getLocationRegistry().resolve(PROVIDER, allFlags);
[2/2] git commit: This closes #306
Posted by gr...@apache.org.
This closes #306
* github/pr/306:
fix for TomcatServerSoftlayerLiveTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/7804628d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/7804628d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/7804628d
Branch: refs/heads/master
Commit: 7804628d23d4b5c7e09959b46c8878233b721e53
Parents: 496052c 48ecea0
Author: Andrew Kennedy <gr...@apache.org>
Authored: Thu Nov 6 15:00:52 2014 +0000
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Thu Nov 6 15:00:52 2014 +0000
----------------------------------------------------------------------
.../java/brooklyn/entity/AbstractSoftlayerLiveTest.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------