From ed536de3d0321e237d206a02c66349d29b0b6bb1 Mon Sep 17 00:00:00 2001
From: Adam Lowe <adam.p.lowe@gmail.com>
Date: Tue, 3 Jul 2012 12:37:35 +0100
Subject: [PATCH] openstack: improving reliability of live tests

---
 .../nova/v2_0/extensions/SecurityGroupClientLiveTest.java     | 2 +-
 .../openstack/nova/v2_0/extensions/VolumeClientLiveTest.java  | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupClientLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupClientLiveTest.java
index c92a0dbc5c..5750a7e92f 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupClientLiveTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupClientLiveTest.java
@@ -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";
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeClientLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeClientLiveTest.java
index 1dc2c061c0..ea3e9813bf 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeClientLiveTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeClientLiveTest.java
@@ -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()));