You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/07/27 20:53:52 UTC
[1/3] usergrid git commit: Add some delay in query validator test
after creating data for the async indexing to complete.
Repository: usergrid
Updated Branches:
refs/heads/apigee-sso-provider 9d78b59bf -> ddde8dddb
Add some delay in query validator test after creating data for the async indexing to complete.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/494f1bbd
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/494f1bbd
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/494f1bbd
Branch: refs/heads/apigee-sso-provider
Commit: 494f1bbdb21d6b29de3b851d052ed35b6fa07978
Parents: 789f884
Author: Michael Russo <mr...@apigee.com>
Authored: Wed Jul 27 13:06:42 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Wed Jul 27 13:06:42 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/usergrid/query/validator/AbstractQueryIT.java | 3 ++-
.../org/apache/usergrid/query/validator/users/UserQueryIT.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/494f1bbd/stack/query-validator/src/test/java/org/apache/usergrid/query/validator/AbstractQueryIT.java
----------------------------------------------------------------------
diff --git a/stack/query-validator/src/test/java/org/apache/usergrid/query/validator/AbstractQueryIT.java b/stack/query-validator/src/test/java/org/apache/usergrid/query/validator/AbstractQueryIT.java
index 139b60b..b751621 100644
--- a/stack/query-validator/src/test/java/org/apache/usergrid/query/validator/AbstractQueryIT.java
+++ b/stack/query-validator/src/test/java/org/apache/usergrid/query/validator/AbstractQueryIT.java
@@ -83,7 +83,7 @@ public class AbstractQueryIT {
password = (String)properties.get("usergrid.query.validator.api.authorize.password");
}
- protected static void createInitializationDatas(String collection) {
+ protected static void createInitializationDatas(String collection) throws InterruptedException{
List<Entity> entities = loadEntitiesFromResource(collection);
QueryValidationConfiguration configuration = new QueryValidationConfiguration();
configuration.setEndpointUri(fullEndpoint);
@@ -95,6 +95,7 @@ public class AbstractQueryIT {
configuration.setEntities(entities);
validator.setConfiguration(configuration);
validator.setup();
+ Thread.sleep(1000);
}
private static List<Entity> loadEntitiesFromResource(String collection) {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/494f1bbd/stack/query-validator/src/test/java/org/apache/usergrid/query/validator/users/UserQueryIT.java
----------------------------------------------------------------------
diff --git a/stack/query-validator/src/test/java/org/apache/usergrid/query/validator/users/UserQueryIT.java b/stack/query-validator/src/test/java/org/apache/usergrid/query/validator/users/UserQueryIT.java
index 915b353..445d153 100644
--- a/stack/query-validator/src/test/java/org/apache/usergrid/query/validator/users/UserQueryIT.java
+++ b/stack/query-validator/src/test/java/org/apache/usergrid/query/validator/users/UserQueryIT.java
@@ -38,7 +38,7 @@ import java.util.List;
public class UserQueryIT extends AbstractQueryIT {
@BeforeClass
- public static void setDatas() {
+ public static void setDatas() throws InterruptedException{
createInitializationDatas("user");
}
[2/3] usergrid git commit: Merge branch 'release-2.1.1'
Posted by mr...@apache.org.
Merge branch 'release-2.1.1'
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/4558dc9d
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/4558dc9d
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/4558dc9d
Branch: refs/heads/apigee-sso-provider
Commit: 4558dc9d65f72860ff241cdd099d36c3754f7d8a
Parents: acd8719 494f1bb
Author: Michael Russo <mr...@apigee.com>
Authored: Wed Jul 27 13:53:21 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Wed Jul 27 13:53:21 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/usergrid/query/validator/AbstractQueryIT.java | 3 ++-
.../org/apache/usergrid/query/validator/users/UserQueryIT.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/3] usergrid git commit: Merge branch 'master' into
apigee-sso-provider
Posted by mr...@apache.org.
Merge branch 'master' into apigee-sso-provider
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ddde8ddd
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ddde8ddd
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ddde8ddd
Branch: refs/heads/apigee-sso-provider
Commit: ddde8dddb60e3e77e7c9ad40201c3727fc77eafc
Parents: 9d78b59 4558dc9
Author: Michael Russo <mr...@apigee.com>
Authored: Wed Jul 27 13:53:44 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Wed Jul 27 13:53:44 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/usergrid/query/validator/AbstractQueryIT.java | 3 ++-
.../org/apache/usergrid/query/validator/users/UserQueryIT.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------