You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/09/20 22:40:59 UTC
[19/30] usergrid git commit: Moving superuser token get out of
try-catch causes some test failures.
Moving superuser token get out of try-catch causes some test failures.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/2aaa37f8
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/2aaa37f8
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/2aaa37f8
Branch: refs/heads/two-dot-o-dev
Commit: 2aaa37f862bb78869f65aa2481884c1758b41768
Parents: 31bacc8
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Sep 9 11:09:43 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Sep 9 11:09:43 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/usergrid/rest/test/resource/ClientSetup.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/2aaa37f8/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/ClientSetup.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/ClientSetup.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/ClientSetup.java
index 57cb7e8..853945d 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/ClientSetup.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/ClientSetup.java
@@ -94,9 +94,8 @@ public class ClientSetup implements TestRule {
String name = testClass + "." + methodName;
try {
-
restClient.superuserSetup();
-
+ superuserToken = restClient.management().token().get(superuserName, superuserPassword);
} catch ( BadRequestException e ) {
if ( logger.isDebugEnabled() ) {
logger.debug( "Error creating superuser, may already exist", e );
@@ -105,7 +104,6 @@ public class ClientSetup implements TestRule {
}
}
- superuserToken = restClient.management().token().get(superuserName, superuserPassword);
username = "user_"+name + UUIDUtils.newTimeUUID();
password = username;