You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2017/01/31 09:21:46 UTC
jclouds git commit: change hostname command to get the short form
Repository: jclouds
Updated Branches:
refs/heads/master 325a6890c -> 4c2151a3f
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/4c2151a3
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/4c2151a3
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/4c2151a3
Branch: refs/heads/master
Commit: 4c2151a3f1a0e5de5256575ccfc625e1b3b16bed
Parents: 325a689
Author: Andrea Turli <an...@gmail.com>
Authored: Mon Jan 30 21:07:05 2017 +0100
Committer: Andrea Turli <an...@gmail.com>
Committed: Tue Jan 31 10:21:33 2017 +0100
----------------------------------------------------------------------
.../compute/internal/BaseComputeServiceLiveTest.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/4c2151a3/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>() {