You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by za...@apache.org on 2015/02/18 11:38:49 UTC
jclouds git commit: Fixes more tests with timing problems
Repository: jclouds
Updated Branches:
refs/heads/master 14d4ce635 -> 07f1fb69a
Fixes more tests with timing problems
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/07f1fb69
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/07f1fb69
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/07f1fb69
Branch: refs/heads/master
Commit: 07f1fb69a71c10767b9150b36d657d94f9f90263
Parents: 14d4ce6
Author: Zack Shoylev <za...@rackspace.com>
Authored: Wed Feb 18 03:20:50 2015 -0600
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Wed Feb 18 03:46:37 2015 -0600
----------------------------------------------------------------------
.../nova/v2_0/predicates/ServerPredicates.java | 15 ++++++++-------
.../integration/internal/BaseBlobSignerLiveTest.java | 8 ++++++++
.../compute/internal/BaseComputeServiceLiveTest.java | 2 ++
3 files changed, 18 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/07f1fb69/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/ServerPredicates.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/ServerPredicates.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/ServerPredicates.java
index d29f081..21c5936 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/ServerPredicates.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/predicates/ServerPredicates.java
@@ -16,10 +16,6 @@
*/
package org.jclouds.openstack.nova.v2_0.predicates;
-import com.google.common.base.Predicate;
-import org.jclouds.openstack.nova.v2_0.domain.Server;
-import org.jclouds.openstack.nova.v2_0.features.ServerApi;
-
import static com.google.common.base.Preconditions.checkNotNull;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.jclouds.openstack.nova.v2_0.domain.Server.Status;
@@ -27,6 +23,11 @@ import static org.jclouds.openstack.nova.v2_0.domain.Server.Status.ACTIVE;
import static org.jclouds.openstack.nova.v2_0.domain.Server.Status.SHUTOFF;
import static org.jclouds.util.Predicates2.retry;
+import org.jclouds.openstack.nova.v2_0.domain.Server;
+import org.jclouds.openstack.nova.v2_0.features.ServerApi;
+
+import com.google.common.base.Predicate;
+
/**
* This class tests to see if a Server or ServerCreated has reached a desired status. This class is most useful when
* paired with a RetryablePredicate as in the code below. Together these classes can be used to block execution until
@@ -52,7 +53,7 @@ import static org.jclouds.util.Predicates2.retry;
* </pre>
*/
public class ServerPredicates {
- private static final int TEN_MINUTES = 600;
+ private static final int THIRTY_MINUTES = 600 * 3;
private static final int FIVE_SECONDS = 5;
/**
@@ -62,7 +63,7 @@ public class ServerPredicates {
* @return Predicate that will check the status every 5 seconds for a maximum of 10 minutes.
*/
public static Predicate<String> awaitActive(ServerApi serverApi) {
- return awaitStatus(serverApi, ACTIVE, TEN_MINUTES, FIVE_SECONDS);
+ return awaitStatus(serverApi, ACTIVE, THIRTY_MINUTES, FIVE_SECONDS);
}
/**
@@ -72,7 +73,7 @@ public class ServerPredicates {
* @return Predicate that will check the status every 5 seconds for a maximum of 10 minutes.
*/
public static Predicate<String> awaitShutoff(ServerApi serverApi) {
- return awaitStatus(serverApi, SHUTOFF, TEN_MINUTES, FIVE_SECONDS);
+ return awaitStatus(serverApi, SHUTOFF, THIRTY_MINUTES, FIVE_SECONDS);
}
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/07f1fb69/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobSignerLiveTest.java
----------------------------------------------------------------------
diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobSignerLiveTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobSignerLiveTest.java
index c1a0d05..2bee444 100644
--- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobSignerLiveTest.java
+++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobSignerLiveTest.java
@@ -24,6 +24,7 @@ import static org.testng.Assert.fail;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
+import org.jclouds.blobstore.attr.ConsistencyModel;
import org.jclouds.blobstore.domain.Blob;
import org.jclouds.http.HttpRequest;
import org.jclouds.rest.AuthorizationException;
@@ -169,6 +170,7 @@ public class BaseBlobSignerLiveTest extends BaseBlobStoreIntegrationTest {
String container = getContainerName();
try {
view.getBlobStore().putBlob(container, blob);
+ awaitConsistency();
assertConsistencyAwareContainerSize(container, 1);
HttpRequest request = view.getSigner().signRemoveBlob(container, name);
assertEquals(request.getFilters().size(), 0);
@@ -178,4 +180,10 @@ public class BaseBlobSignerLiveTest extends BaseBlobStoreIntegrationTest {
returnContainer(container);
}
}
+
+ protected void awaitConsistency() {
+ if (view.getConsistencyModel() == ConsistencyModel.EVENTUAL) {
+ Uninterruptibles.sleepUninterruptibly(10, TimeUnit.SECONDS);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/07f1fb69/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java
----------------------------------------------------------------------
diff --git a/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java b/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java
index bcf6107..a0da138 100644
--- a/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java
+++ b/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java
@@ -112,6 +112,7 @@ import com.google.common.net.HostAndPort;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.Uninterruptibles;
import com.google.inject.Key;
import com.google.inject.Module;
import com.google.inject.name.Names;
@@ -650,6 +651,7 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte
int toDestroy = refreshNodes().size();
Set<? extends NodeMetadata> destroyed = client.destroyNodesMatching(inGroup(group));
assertEquals(toDestroy, destroyed.size());
+ Uninterruptibles.sleepUninterruptibly(10, TimeUnit.SECONDS);
for (NodeMetadata node : filter(client.listNodesDetailsMatching(all()), inGroup(group))) {
assert node.getStatus() == Status.TERMINATED : node;
assert view.utils().credentialStore().get("node#" + node.getId()) == null : "credential should have been null for "