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

openstack: improving reliability of live tests

This commit is contained in:
Adam Lowe 2012-07-03 12:37:35 +01:00
parent a8a6cb083d
commit ed536de3d0
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupClientLiveTest.java
View File

@ -37,7 +37,7 @@ import com.google.common.collect.ImmutableSet;
*
* @author Michael Arnold
*/
@Test(groups = "live", testName = "SecurityGroupClientLiveTest")
@Test(groups = "live", testName = "SecurityGroupClientLiveTest", singleThreaded = true)
public class SecurityGroupClientLiveTest extends BaseNovaClientLiveTest {
public static final String SECURITY_GROUP_NAME = "testsg";

4
apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeClientLiveTest.java
View File

@ -27,7 +27,6 @@ import java.util.Set;
import org.jclouds.openstack.nova.v2_0.domain.Volume;
import org.jclouds.openstack.nova.v2_0.domain.VolumeAttachment;
import org.jclouds.openstack.nova.v2_0.domain.VolumeSnapshot;
import org.jclouds.openstack.nova.v2_0.extensions.VolumeClient;
import org.jclouds.openstack.nova.v2_0.internal.BaseNovaClientLiveTest;
import org.jclouds.openstack.nova.v2_0.options.CreateVolumeOptions;
import org.jclouds.openstack.nova.v2_0.options.CreateVolumeSnapshotOptions;
@ -128,7 +127,6 @@ public class VolumeClientLiveTest extends BaseNovaClientLiveTest {
if (volumeOption.isPresent()) {
Set<Volume> volumes = volumeOption.get().listVolumesInDetail();
assertNotNull(volumes);
assertTrue(volumes.contains(testVolume));
boolean foundIt = false;
for (Volume vol : volumes) {
Volume details = volumeOption.get().getVolume(vol.getId());
@ -239,7 +237,7 @@ public class VolumeClientLiveTest extends BaseNovaClientLiveTest {
assertTrue(new RetryablePredicate<VolumeClient>(new Predicate<VolumeClient>() {
@Override
public boolean apply(VolumeClient volumeClient) {
return volumeOption.get().listAttachmentsOnServer(serverId).size() == before + 1;
return volumeOption.get().listAttachmentsOnServer(serverId).size() > before;
}
}, 60 * 1000L).apply(volumeOption.get()));