Repository: jclouds Updated Branches: refs/heads/2.0.x 86f518ddd -> 10a585e50
change hostname command to get the short form Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/10a585e5 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/10a585e5 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/10a585e5 Branch: refs/heads/2.0.x Commit: 10a585e504328e010d7003da71a41362c8346279 Parents: 86f518d Author: Andrea Turli <[email protected]> Authored: Mon Jan 30 21:07:05 2017 +0100 Committer: Andrea Turli <[email protected]> Committed: Tue Jan 31 10:22:03 2017 +0100 ---------------------------------------------------------------------- .../compute/internal/BaseComputeServiceLiveTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/10a585e5/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java ---------------------------------------------------------------------- diff --git a/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java b/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java index f8d9154..9e41a64 100644 --- a/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java +++ b/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java @@ -231,13 +231,13 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte assert good.identity != null : nodes; for (Entry<? extends NodeMetadata, ExecResponse> response : client.runScriptOnNodesMatching( - runningInGroup(group), "hostname", + runningInGroup(group), "hostname -s", wrapInInitScript(false).runAsRoot(false).overrideLoginCredentials(good)).entrySet()) { checkResponseEqualsHostname(response.getValue(), response.getKey()); } // test single-node execution - ExecResponse response = client.runScriptOnNode(node.getId(), "hostname", + ExecResponse response = client.runScriptOnNode(node.getId(), "hostname -s", wrapInInitScript(false).runAsRoot(false)); checkResponseEqualsHostname(response, node); OperatingSystem os = node.getOperatingSystem(); @@ -269,7 +269,7 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte client.destroyNodesMatching(inGroup(group)); } } - + @Test public void testWeCanCancelTasks() throws Exception { String group = this.group + "w"; @@ -401,7 +401,7 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte protected Template refreshTemplate() { return template = addRunScriptToTemplate(buildTemplate(templateBuilder())); - } + } protected Template addRunScriptToTemplate(Template template) { template.getOptions().runScript(Statements.newStatementList(AdminAccess.standard(), InstallJDK.fromOpenJDK())); @@ -439,7 +439,7 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte throw e; } } - + initializeContext(); Location existingLocation = Iterables.get(this.nodes, 0).getLocation(); @@ -556,7 +556,7 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte nodes = newTreeSet(concat(e.getSuccessfulNodes(), e.getNodeErrors().keySet())); throw e; } - + Map<String, ? extends NodeMetadata> metadataMap = newLinkedHashMap(uniqueIndex( filter(client.listNodesDetailsMatching(all()), and(inGroup(group), not(TERMINATED))), new Function<NodeMetadata, String>() {
