Fix AWS EC2 compute live tests
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/06b69ffe Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/06b69ffe Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/06b69ffe Branch: refs/heads/master Commit: 06b69ffed436818e2a4e51e50b7634765908afab Parents: cfe2238 Author: Ignasi Barrera <[email protected]> Authored: Sun Oct 23 19:25:26 2016 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Tue Oct 25 15:19:50 2016 +0200 ---------------------------------------------------------------------- .../compute/internal/BaseComputeServiceLiveTest.java | 2 +- .../aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java | 12 ------------ .../aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/06b69ffe/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 0b53e63..f8d9154 100644 --- a/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java +++ b/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java @@ -679,7 +679,7 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte } } - @Test(enabled = true, dependsOnMethods = { "testListNodes", "testGetNodesWithDetails", "testListNodesByIds" }) + @Test(enabled = true, alwaysRun = true, dependsOnMethods = { "testListNodes", "testGetNodesWithDetails", "testListNodesByIds" }) public void testDestroyNodes() { int toDestroy = refreshNodes().size(); Set<? extends NodeMetadata> destroyed = client.destroyNodesMatching(inGroup(group)); http://git-wip-us.apache.org/repos/asf/jclouds/blob/06b69ffe/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java index b2a4780..3ac06b7 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java @@ -17,7 +17,6 @@ package org.jclouds.aws.ec2.compute; import static com.google.common.collect.Iterables.getOnlyElement; -import static com.google.common.collect.Sets.newTreeSet; import static org.jclouds.compute.domain.OsFamily.AMZN_LINUX; import static org.jclouds.compute.options.RunScriptOptions.Builder.runAsRoot; import static org.jclouds.compute.util.ComputeServiceUtils.getCores; @@ -49,7 +48,6 @@ import org.jclouds.compute.predicates.NodePredicates; import org.jclouds.domain.LoginCredentials; import org.jclouds.ec2.compute.EC2ComputeServiceLiveTest; import org.jclouds.ec2.domain.KeyPair; -import org.jclouds.ec2.domain.SecurityGroup; import org.jclouds.ec2.features.InstanceApi; import org.jclouds.ec2.features.KeyPairApi; import org.jclouds.net.domain.IpProtocol; @@ -58,7 +56,6 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.ImmutableSortedSet; import com.google.common.util.concurrent.ListenableFuture; @Test(groups = "live", singleThreaded = true, testName = "AWSEC2ComputeServiceLiveTest") @@ -173,15 +170,6 @@ public class AWSEC2ComputeServiceLiveTest extends EC2ComputeServiceLiveTest { monitoringApi.close(); } - // make sure we made our dummy group and also let in the user's group - assertEquals(newTreeSet(instance.getGroupNames()), ImmutableSortedSet.<String> of("jclouds#" + group, group)); - - // make sure our dummy group has no rules - SecurityGroup secgroup = getOnlyElement(securityGroupApi.describeSecurityGroupsInRegion(instance - .getRegion(), "jclouds#" + group)); - - assert secgroup.size() == 0 : secgroup; - // try to run a script with the original keyPair runScriptWithCreds(group, first.getOperatingSystem(), LoginCredentials.builder().user( first.getCredentials().identity).privateKey(result.getKeyMaterial()).build()); http://git-wip-us.apache.org/repos/asf/jclouds/blob/06b69ffe/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java index 0be65f9..216b2d9 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java @@ -353,7 +353,7 @@ public class AWSEC2TemplateBuilderLiveTest extends EC2TemplateBuilderLiveTest { @Override protected Set<String> getIso3166Codes() { - return ImmutableSet.of("US-VA", "US-CA", "US-OR", "BR-SP", "IE", "DE-HE", "SG", "AU-NSW", "JP-13"); + return ImmutableSet.of("US-VA", "US-CA", "US-OR", "BR-SP", "IE", "DE-HE", "SG", "AU-NSW", "IN-MH", "JP-13", "KR-11"); } }
