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

ec2 test stabilization

This commit is contained in:
Adrian Cole 2011-10-14 10:34:22 -07:00
parent e9029db0ba
commit 9018bdafa2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java
View File

@ -106,6 +106,8 @@ public class AWSEC2ComputeServiceLiveTest extends EC2ComputeServiceLiveTest {
try {
cleanupExtendedStuffInRegion(region, securityGroupClient, keyPairClient, group);
Thread.sleep(3000);// eventual consistency if deletes actually occurred.
// create a security group that allows ssh in so that our scripts later
// will work
String groupId = securityGroupClient.createSecurityGroupInRegionAndReturnId(region, group, group);

5
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/SpotInstanceClientLiveTest.java
View File

@ -139,8 +139,9 @@ public class SpotInstanceClientLiveTest {
for (Spot spot : spots) {
assert spot.getSpotPrice() > 0 : spots;
assertEquals(spot.getRegion(), region);
assert in(ImmutableSet.of("Linux/UNIX", "SUSE Linux", "Windows", "Windows (Amazon VPC)")).apply(
spot.getProductDescription()) : spot;
assert in(
ImmutableSet.of("Linux/UNIX", "Linux/UNIX (Amazon VPC)", "SUSE Linux", "SUSE Linux (Amazon VPC)",
"Windows", "Windows (Amazon VPC)")).apply(spot.getProductDescription()) : spot;
assert in(
ImmutableSet.of("c1.medium", "c1.xlarge", "cc1.4xlarge", "cg1.4xlarge", "m1.large", "m1.small",
"m1.xlarge", "m2.2xlarge", "m2.4xlarge", "m2.xlarge", "t1.micro")).apply(