From d805095c2633b2551c01046017cdf0e3bbf5dbf8 Mon Sep 17 00:00:00 2001 From: zack-shoylev Date: Sun, 28 Apr 2013 00:15:00 -0500 Subject: [PATCH] fixes live rackspace tests --- .../compute/internal/BaseComputeServiceLiveTest.java | 3 --- .../compute/CloudServersUSTemplateBuilderLiveTest.java | 10 +++++----- 2 files changed, 5 insertions(+), 8 deletions(-) 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 67e18a7ec1..4e39e84cfe 100644 --- a/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java +++ b/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java @@ -47,7 +47,6 @@ import static org.jclouds.util.Predicates2.retry; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.fail; - import java.io.IOException; import java.util.Collection; import java.util.List; @@ -62,7 +61,6 @@ import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; - import org.jclouds.compute.ComputeService; import org.jclouds.compute.ComputeServiceContext; import org.jclouds.compute.ComputeTestUtils; @@ -96,7 +94,6 @@ import org.jclouds.ssh.SshException; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Predicates; diff --git a/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSTemplateBuilderLiveTest.java b/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSTemplateBuilderLiveTest.java index a87efe3852..1fad99f4fe 100644 --- a/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSTemplateBuilderLiveTest.java +++ b/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSTemplateBuilderLiveTest.java @@ -53,13 +53,13 @@ public class CloudServersUSTemplateBuilderLiveTest extends BaseTemplateBuilderLi public boolean apply(OsFamilyVersion64Bit input) { switch (input.family) { case UBUNTU: - return (input.version.equals("") || (input.version.matches("^1[012].*") && !input.version + return (input.version.equals("") || (input.version.matches("^1[012].*") && !input.version.equals("11.04") && !input.version .equals("10.10"))) && input.is64Bit; case DEBIAN: return input.is64Bit && !input.version.equals("5.0"); case CENTOS: - return (input.version.equals("") || input.version.equals("5.6") || input.version.equals("6.0")) + return (input.version.equals("") || input.version.equals("5.6") || input.version.equals("6.0") || input.version.equals("5.0")) && input.is64Bit; case WINDOWS: return input.is64Bit && input.version.equals(""); @@ -79,9 +79,9 @@ public class CloudServersUSTemplateBuilderLiveTest extends BaseTemplateBuilderLi assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU); assertEquals(defaultTemplate.getImage().getName(), "Ubuntu 12.04 LTS (Precise Pangolin)"); assertEquals(defaultTemplate.getImage().getDefaultCredentials().getUser(), "root"); - assertEquals(defaultTemplate.getLocation().getId(), "ORD"); - assertEquals(defaultTemplate.getImage().getLocation().getId(), "ORD"); - assertEquals(defaultTemplate.getHardware().getLocation().getId(), "ORD"); + assertEquals(defaultTemplate.getLocation().getId(), "DFW"); + assertEquals(defaultTemplate.getImage().getLocation().getId(), "DFW"); + assertEquals(defaultTemplate.getHardware().getLocation().getId(), "DFW"); assertEquals(defaultTemplate.getOptions().as(NovaTemplateOptions.class).shouldAutoAssignFloatingIp(), false); assertEquals(getCores(defaultTemplate.getHardware()), 1.0d); }