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

removed unnecessary removals and added comments about inconsistent rackspace api

This commit is contained in:
danikov 2011-11-16 15:16:21 +00:00
parent d44bf5d23e
commit 575dac2583
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/NodeClientLiveTest.java
View File

@ -21,6 +21,7 @@ package org.jclouds.cloudloadbalancers.features;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue; import static org.testng.Assert.assertTrue;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
@ -66,11 +67,6 @@ public class NodeClientLiveTest extends BaseCloudLoadBalancersClientLiveTest {
protected void tearDown() { protected void tearDown() {
for (Entry<LoadBalancer, Set<Node>> entry : nodes.entrySet()) { for (Entry<LoadBalancer, Set<Node>> entry : nodes.entrySet()) {
LoadBalancer lb = entry.getKey(); LoadBalancer lb = entry.getKey();
for (Node n : entry.getValue()) {
client.getNodeClient(lb.getRegion()).removeNode(lb.getId(), n.getId());
assertEquals(client.getNodeClient(lb.getRegion()).
getNode(lb.getId(), n.getId()), null);
}
client.getLoadBalancerClient(lb.getRegion()).removeLoadBalancer(lb.getId()); client.getLoadBalancerClient(lb.getRegion()).removeLoadBalancer(lb.getId());
assert loadBalancerDeleted.apply(lb) : lb; assert loadBalancerDeleted.apply(lb) : lb;
@ -89,7 +85,7 @@ public class NodeClientLiveTest extends BaseCloudLoadBalancersClientLiveTest {
assert n.getAddress() != null : n; assert n.getAddress() != null : n;
assert n.getPort() != -1 : n; assert n.getPort() != -1 : n;
assert n.getStatus() != null : n; assert n.getStatus() != null : n;
assert n.getWeight() != -1 : n; assert n.getWeight() != null : n; //FIXME may fail as can be null (json response doesn't have the attribute)
Node getDetails = client.getNodeClient(lb.getRegion()).getNode(lb.getId(), n.getId()); Node getDetails = client.getNodeClient(lb.getRegion()).getNode(lb.getId(), n.getId());
System.out.println(n.toString()); System.out.println(n.toString());
@ -99,7 +95,7 @@ public class NodeClientLiveTest extends BaseCloudLoadBalancersClientLiveTest {
assertEquals(getDetails.getAddress(), n.getAddress()); assertEquals(getDetails.getAddress(), n.getAddress());
assertEquals(getDetails.getPort(), n.getPort()); assertEquals(getDetails.getPort(), n.getPort());
assertEquals(getDetails.getStatus(), n.getStatus()); assertEquals(getDetails.getStatus(), n.getStatus());
assertEquals(getDetails.getWeight(), n.getWeight()); assertEquals(getDetails.getWeight(), n.getWeight()); //FIXME disparity between list/get can lead these to mismatch
} catch (AssertionError e) { } catch (AssertionError e) {
throw new AssertionError(String.format("%s\n%s - %s", e.getMessage(),getDetails, n)); throw new AssertionError(String.format("%s\n%s - %s", e.getMessage(),getDetails, n));
} }