From ee0bade6ade1380c68d21540bf3ed347f1513286 Mon Sep 17 00:00:00 2001 From: Andrew Donald Kennedy Date: Wed, 21 Dec 2011 11:05:29 +0000 Subject: [PATCH] PublicIpInstanceIdPair has different id format to node --- .../org/jclouds/ec2/compute/EC2ComputeServiceLiveTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2ComputeServiceLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2ComputeServiceLiveTest.java index bbb87c0be3..20caa79d82 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2ComputeServiceLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2ComputeServiceLiveTest.java @@ -22,6 +22,7 @@ import java.util.Map; import java.util.Properties; import java.util.Set; +import com.google.common.base.Splitter; import org.jclouds.compute.BaseComputeServiceLiveTest; import org.jclouds.compute.ComputeServiceContext; import org.jclouds.compute.ComputeServiceContextFactory; @@ -173,7 +174,7 @@ public class EC2ComputeServiceLiveTest extends BaseComputeServiceLiveTest { } } - @Test(enabled = true, dependsOnMethods = "testCompareSizes") + @Test(enabled = true) //, dependsOnMethods = "testCompareSizes") public void testAutoIpAllocation() throws Exception { ComputeServiceContext context = null; String group = this.group + "aip"; @@ -211,7 +212,7 @@ public class EC2ComputeServiceLiveTest extends BaseComputeServiceLiveTest { // check that the elastic ip is in node.publicAddresses PublicIpInstanceIdPair ipidpair = Iterables.get(ipidpairs, 0); - assertEquals(ipidpair.getInstanceId(), node.getId()); + assertEquals(region + "/" + ipidpair.getInstanceId(), node.getId()); // delete the node context.getComputeService().destroyNodesMatching(NodePredicates.inGroup(group));