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

Merge pull request #138 from andreisavu/kt-fix-2-tests 

Fixed two integration tests failing on KT cloud
This commit is contained in:
Adrian Cole 2011-11-11 08:48:43 -08:00
parent 6fc9d5d796 92e0a5480c
commit f7c6683a42
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java
View File

@ -79,7 +79,9 @@ public class NetworkClientLiveTest extends BaseCloudStackClientLiveTest {
@AfterGroups(groups = "live") @AfterGroups(groups = "live")
protected void tearDown() { protected void tearDown() {
if (network != null) { if (network != null) {
jobComplete.apply(client.getNetworkClient().deleteNetwork(network.getId())); Long jobId = client.getNetworkClient().deleteNetwork(network.getId());
if (jobId != null)
jobComplete.apply(jobId);
} }
super.tearDown(); super.tearDown();
} }

6
sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/OfferingClientLiveTest.java
View File

@ -21,6 +21,7 @@ package org.jclouds.cloudstack.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.NoSuchElementException;
import java.util.Set; import java.util.Set;
import org.jclouds.cloudstack.domain.DiskOffering; import org.jclouds.cloudstack.domain.DiskOffering;
@ -49,6 +50,7 @@ public class OfferingClientLiveTest extends BaseCloudStackClientLiveTest {
long offeringCount = response.size(); long offeringCount = response.size();
assertTrue(offeringCount >= 0); assertTrue(offeringCount >= 0);
for (DiskOffering offering : response) { for (DiskOffering offering : response) {
try {
DiskOffering newDetails = Iterables.getOnlyElement(client.getOfferingClient().listDiskOfferings( DiskOffering newDetails = Iterables.getOnlyElement(client.getOfferingClient().listDiskOfferings(
ListDiskOfferingsOptions.Builder.id(offering.getId()))); ListDiskOfferingsOptions.Builder.id(offering.getId())));
assertEquals(offering, newDetails); assertEquals(offering, newDetails);
@ -59,6 +61,10 @@ public class OfferingClientLiveTest extends BaseCloudStackClientLiveTest {
assert offering.getDisplayText() != null : offering; assert offering.getDisplayText() != null : offering;
assert offering.getDiskSize() > 0 || (offering.getDiskSize() == 0 && offering.isCustomized()) : offering; assert offering.getDiskSize() > 0 || (offering.getDiskSize() == 0 && offering.isCustomized()) : offering;
assert offering.getTags() != null : offering; assert offering.getTags() != null : offering;
} catch (NoSuchElementException e) {
assertEquals(apiversion, "2.2.8");
}
} }
} }