Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #149 from andreisavu/more-test-fixing 

Fixed and disabled some tests (disk offerings, ssh keys, service execution)
This commit is contained in:
Adrian Cole 2011-11-15 04:17:23 -08:00
parent e1f66caec0 2c5d5efec6
commit 056085428f
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceLiveTest.java
View File

@ -61,4 +61,12 @@ public class CloudStackComputeServiceLiveTest extends BaseComputeServiceLiveTest
assert node.getUserMetadata().equals(ImmutableMap.<String, String> of()) : String.format( assert node.getUserMetadata().equals(ImmutableMap.<String, String> of()) : String.format(
"node userMetadata did not match %s %s", userMetadata, node); "node userMetadata did not match %s %s", userMetadata, node);
} }
@Override
@Test(enabled = false)
public void testCreateAndRunAService() throws Exception {
/* Disabling this test because it's never going to pass if we
don't have internet connectivity from the cloudstack environment */
super.testCreateAndRunAService();
}
} }

3
apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/OfferingClientLiveTest.java
View File

@ -63,7 +63,8 @@ public class OfferingClientLiveTest extends BaseCloudStackClientLiveTest {
assert offering.getTags() != null : offering; assert offering.getTags() != null : offering;
} catch (NoSuchElementException e) { } catch (NoSuchElementException e) {
assertEquals(apiversion, "2.2.8"); // This bug is present both in 2.2.8 and 2.2.12
assertTrue("2.2.8".equals(apiversion) || "2.2.12".equals(apiversion));
} }
} }
} }

27
apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairClientLiveTest.java
View File

@ -25,6 +25,8 @@ import java.util.Set;
import org.jclouds.cloudstack.domain.SshKeyPair; import org.jclouds.cloudstack.domain.SshKeyPair;
import org.jclouds.crypto.SshKeys; import org.jclouds.crypto.SshKeys;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/** /**
@ -36,8 +38,15 @@ import org.testng.annotations.Test;
public class SSHKeyPairClientLiveTest extends BaseCloudStackClientLiveTest { public class SSHKeyPairClientLiveTest extends BaseCloudStackClientLiveTest {
protected String prefix = System.getProperty("user.name"); protected String prefix = System.getProperty("user.name");
private String keyPairName = prefix + "-jclouds-keypair";
private SshKeyPair sshKeyPair; private SshKeyPair sshKeyPair;
@BeforeMethod
@AfterMethod
public void removeExistingKey() {
client.getSSHKeyPairClient().deleteSSHKeyPair(keyPairName);
}
public void testListSSHKeyPairs() { public void testListSSHKeyPairs() {
final Set<SshKeyPair> sshKeyPairs = client.getSSHKeyPairClient().listSSHKeyPairs(); final Set<SshKeyPair> sshKeyPairs = client.getSSHKeyPairClient().listSSHKeyPairs();
for (SshKeyPair sshKeyPair : sshKeyPairs) { for (SshKeyPair sshKeyPair : sshKeyPairs) {
@ -46,32 +55,32 @@ public class SSHKeyPairClientLiveTest extends BaseCloudStackClientLiveTest {
} }
public void testCreateDeleteSSHKeyPair() { public void testCreateDeleteSSHKeyPair() {
sshKeyPair = client.getSSHKeyPairClient().createSSHKeyPair(prefix + "jclouds-keypair"); sshKeyPair = client.getSSHKeyPairClient().createSSHKeyPair(keyPairName);
checkSSHKeyPair(sshKeyPair); checkSSHKeyPair(sshKeyPair);
client.getSSHKeyPairClient().deleteSSHKeyPair(sshKeyPair.getName()); client.getSSHKeyPairClient().deleteSSHKeyPair(sshKeyPair.getName());
assertEquals(client.getSSHKeyPairClient().getSSHKeyPair(sshKeyPair.getName()), null); assertEquals(client.getSSHKeyPairClient().getSSHKeyPair(sshKeyPair.getName()), null);
// Set the keypair to null , if the delete test is passed.
assertEquals(SshKeys.fingerprintPrivateKey(sshKeyPair.getPrivateKey()), sshKeyPair.getFingerprint()); assertEquals(SshKeys.fingerprintPrivateKey(sshKeyPair.getPrivateKey()), sshKeyPair.getFingerprint());
sshKeyPair = null; sshKeyPair = null;
} }
public void testRegisterDeleteSSHKeyPair() { public void testRegisterDeleteSSHKeyPair() {
final Map<String, String> sshKey = SshKeys.generate(); final Map<String, String> sshKey = SshKeys.generate();
final String publicKey = sshKey.get("public"); final String publicKey = sshKey.get("public");
final String privateKey = sshKey.get("private");
sshKeyPair = client.getSSHKeyPairClient().registerSSHKeyPair(prefix + "jclouds-keypair", publicKey); sshKeyPair = client.getSSHKeyPairClient().registerSSHKeyPair(keyPairName, publicKey);
checkSSHKeyPair(sshKeyPair); checkSSHKeyPair(sshKeyPair);
client.getSSHKeyPairClient().deleteSSHKeyPair(prefix + "jclouds-keypair"); client.getSSHKeyPairClient().deleteSSHKeyPair(keyPairName);
assertEquals(client.getSSHKeyPairClient().getSSHKeyPair(sshKeyPair.getName()), null); assertEquals(client.getSSHKeyPairClient().getSSHKeyPair(sshKeyPair.getName()), null);
//FIXME: somehow the fingerprints aren't matching, so leaving this commented out for now //FIXME: somehow the fingerprints aren't matching, so leaving this commented out for now
// assertEquals(SshKeys.fingerprintPublicKey(publicKey), sshKeyPair.getFingerprint()); // assertEquals(SshKeys.fingerprintPublicKey(publicKey), sshKeyPair.getFingerprint());
// Set the keypair to null , if the delete test is passed.
sshKeyPair = null; sshKeyPair = null;
} }
protected void checkSSHKeyPair(SshKeyPair pair) { protected void checkSSHKeyPair(SshKeyPair pair) {
assert pair.getName() != null : pair; assert pair.getName() != null : pair;
assertEquals(pair.toString(), client.getSSHKeyPairClient().getSSHKeyPair(pair.getName()).toString()); assertEquals(pair.toString(), client.getSSHKeyPairClient().getSSHKeyPair(pair.getName()).toString());