You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by za...@apache.org on 2015/02/06 00:02:27 UTC
jclouds git commit: fix jclouds live tests failing when a keypair is
missing.
Repository: jclouds
Updated Branches:
refs/heads/master 67a7031f3 -> 66457ff8f
fix jclouds live tests failing when a keypair is missing.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/66457ff8
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/66457ff8
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/66457ff8
Branch: refs/heads/master
Commit: 66457ff8f89ef21d1bf35aac3f741d040bff0c03
Parents: 67a7031
Author: Zack Shoylev <za...@rackspace.com>
Authored: Wed Feb 4 14:18:44 2015 -0600
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Thu Feb 5 17:00:49 2015 -0600
----------------------------------------------------------------------
.../src/test/java/org/jclouds/compute/ComputeTestUtils.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/66457ff8/compute/src/test/java/org/jclouds/compute/ComputeTestUtils.java
----------------------------------------------------------------------
diff --git a/compute/src/test/java/org/jclouds/compute/ComputeTestUtils.java b/compute/src/test/java/org/jclouds/compute/ComputeTestUtils.java
index eef8681..eb0beec 100644
--- a/compute/src/test/java/org/jclouds/compute/ComputeTestUtils.java
+++ b/compute/src/test/java/org/jclouds/compute/ComputeTestUtils.java
@@ -30,6 +30,7 @@ import java.util.concurrent.TimeoutException;
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.rest.HttpClient;
+import org.jclouds.ssh.SshKeys;
import com.google.common.base.Charsets;
import com.google.common.base.Throwables;
@@ -48,7 +49,12 @@ public class ComputeTestUtils {
} catch (NullPointerException e) {
secretKeyFile = System.getProperty("user.home") + "/.ssh/id_rsa";
}
- checkSecretKeyFile(secretKeyFile);
+ try {
+ checkSecretKeyFile(secretKeyFile);
+ }
+ catch (IllegalStateException e) {
+ return SshKeys.generate();
+ }
try {
String secret = Files.toString(new File(secretKeyFile), Charsets.UTF_8);
assert secret.startsWith("-----BEGIN RSA PRIVATE KEY-----") : "invalid key:\n" + secret;