diff --git a/apis/elb/pom.xml b/apis/elb/pom.xml index 7adb982f66..bc016dffc5 100644 --- a/apis/elb/pom.xml +++ b/apis/elb/pom.xml @@ -38,6 +38,11 @@ 2010-07-01 ${test.aws.identity} ${test.aws.credential} + ec2 + https://ec2.us-east-1.amazonaws.com + 2010-06-15 + ${test.aws.identity} + ${test.aws.credential} @@ -79,6 +84,12 @@ ${project.version} test + + log4j + log4j + 1.2.16 + test + @@ -114,6 +125,26 @@ test.elb.credential ${test.elb.credential} + + test.elb.compute.provider + ${test.elb.compute.provider} + + + test.elb.compute.endpoint + ${test.elb.compute.endpoint} + + + test.elb.compute.apiversion + ${test.elb.compute.apiversion} + + + test.elb.compute.identity + ${test.elb.compute.identity} + + + test.elb.compute.credential + ${test.elb.compute.credential} + diff --git a/apis/elb/src/test/java/org/jclouds/elb/ELBClientLiveTest.java b/apis/elb/src/test/java/org/jclouds/elb/ELBClientLiveTest.java index d3ff780723..82c79e6f72 100644 --- a/apis/elb/src/test/java/org/jclouds/elb/ELBClientLiveTest.java +++ b/apis/elb/src/test/java/org/jclouds/elb/ELBClientLiveTest.java @@ -108,7 +108,7 @@ public class ELBClientLiveTest { Region.AP_SOUTHEAST_1)) { Set allResults = client.describeLoadBalancersInRegion(region); assertNotNull(allResults); - assert (allResults.size() >= 1); + assert (allResults.size() >= 1) : region; } } diff --git a/loadbalancer/src/test/java/org/jclouds/loadbalancer/BaseLoadBalancerServiceLiveTest.java b/loadbalancer/src/test/java/org/jclouds/loadbalancer/BaseLoadBalancerServiceLiveTest.java index e340a0744d..9438b69af5 100644 --- a/loadbalancer/src/test/java/org/jclouds/loadbalancer/BaseLoadBalancerServiceLiveTest.java +++ b/loadbalancer/src/test/java/org/jclouds/loadbalancer/BaseLoadBalancerServiceLiveTest.java @@ -89,11 +89,10 @@ public abstract class BaseLoadBalancerServiceLiveTest { apiversion = System.getProperty("test." + provider + ".apiversion"); computeProvider = checkNotNull(System.getProperty("test." + provider + ".compute.provider"), "test." + provider + ".compute.provider"); - computeIdentity = checkNotNull(System.getProperty("test." + computeProvider + ".identity"), "test." - + computeProvider + ".identity"); - computeCredential = System.getProperty("test." + computeProvider + ".credential"); - computeEndpoint = System.getProperty("test." + computeProvider + ".endpoint"); - computeApiversion = System.getProperty("test." + computeProvider + ".apiversion"); + computeIdentity = checkNotNull(System.getProperty("test." + provider + ".compute.identity"), "test." + provider + ".compute.identity"); + computeCredential = System.getProperty("test." + provider + ".compute.credential"); + computeEndpoint = System.getProperty("test." + provider + ".compute.endpoint"); + computeApiversion = System.getProperty("test." + provider + ".compute.apiversion"); } protected Properties setupProperties() {