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

openstack-glance: adjusting to allow tests to pass when images have been reserved

This commit is contained in:
Adam Lowe 2012-05-31 14:08:40 +01:00
parent 03267c6e33
commit 7de87a1238
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
labs/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageClientLiveTest.java
View File

@ -23,13 +23,9 @@ import static org.jclouds.openstack.glance.v1_0.options.CreateImageOptions.Build
import static org.jclouds.openstack.glance.v1_0.options.CreateImageOptions.Builder.diskFormat; import static org.jclouds.openstack.glance.v1_0.options.CreateImageOptions.Builder.diskFormat;
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 static org.testng.Assert.fail;
import java.io.File;
import java.util.Set; import java.util.Set;
import org.jclouds.io.Payload;
import org.jclouds.io.payloads.FilePayload;
import org.jclouds.io.payloads.StringPayload; import org.jclouds.io.payloads.StringPayload;
import org.jclouds.openstack.glance.v1_0.domain.ContainerFormat; import org.jclouds.openstack.glance.v1_0.domain.ContainerFormat;
import org.jclouds.openstack.glance.v1_0.domain.DiskFormat; import org.jclouds.openstack.glance.v1_0.domain.DiskFormat;
@ -40,7 +36,6 @@ import org.jclouds.openstack.glance.v1_0.options.ListImageOptions;
import org.jclouds.openstack.glance.v1_0.options.UpdateImageOptions; import org.jclouds.openstack.glance.v1_0.options.UpdateImageOptions;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.base.Optional;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
/** /**
@ -64,8 +59,8 @@ public class ImageClientLiveTest extends BaseGlanceClientLiveTest {
private void checkImage(Image image) { private void checkImage(Image image) {
assert image.getId() != null : image; assert image.getId() != null : image;
assert image.getSize().isPresent() : image; assert image.getName() != null : image;
assert image.getChecksum().isPresent() : image; assert image.getLinks() != null : image;
} }
@Test @Test
@ -85,7 +80,8 @@ public class ImageClientLiveTest extends BaseGlanceClientLiveTest {
private void checkImageDetails(ImageDetails image) { private void checkImageDetails(ImageDetails image) {
checkImage(image); checkImage(image);
// TODO assertTrue(image.getMinDisk() >= 0);
assertTrue(image.getMinRam() >= 0);
} }
private void checkImageDetailsEqual(ImageDetails image, ImageDetails newDetails) { private void checkImageDetailsEqual(ImageDetails image, ImageDetails newDetails) {