mirror of https://github.com/apache/jclouds.git
Merge pull request #138 from andreisavu/kt-fix-2-tests
Fixed two integration tests failing on KT cloud
This commit is contained in:
commit
f7c6683a42
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
|
@ -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,16 +50,21 @@ 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) {
|
||||||
DiskOffering newDetails = Iterables.getOnlyElement(client.getOfferingClient().listDiskOfferings(
|
try {
|
||||||
|
DiskOffering newDetails = Iterables.getOnlyElement(client.getOfferingClient().listDiskOfferings(
|
||||||
ListDiskOfferingsOptions.Builder.id(offering.getId())));
|
ListDiskOfferingsOptions.Builder.id(offering.getId())));
|
||||||
assertEquals(offering, newDetails);
|
assertEquals(offering, newDetails);
|
||||||
assertEquals(offering, client.getOfferingClient().getDiskOffering(offering.getId()));
|
assertEquals(offering, client.getOfferingClient().getDiskOffering(offering.getId()));
|
||||||
assert offering.getId() > 0 : offering;
|
assert offering.getId() > 0 : offering;
|
||||||
assert offering.getName() != null : offering;
|
assert offering.getName() != null : offering;
|
||||||
assert offering.getCreated() != null : offering;
|
assert offering.getCreated() != null : offering;
|
||||||
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");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue