usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [42/50] [abbrv] incubator-usergrid git commit: Fixed service tier being in crash loop. Added comment into why test is failing .
Date Thu, 28 May 2015 12:53:47 GMT
Fixed service tier being in crash loop.
Added comment into why test is failing .


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/73e22925
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/73e22925
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/73e22925

Branch: refs/heads/USERGRID-669
Commit: 73e22925dfec26821ba6ee92586953704b8d2b0c
Parents: 5a88903
Author: GERey <greyes@apigee.com>
Authored: Wed May 27 12:36:12 2015 -0700
Committer: GERey <greyes@apigee.com>
Committed: Wed May 27 12:36:12 2015 -0700

----------------------------------------------------------------------
 stack/pom.xml                                               | 9 +++++----
 .../org/apache/usergrid/services/ConnectionsServiceIT.java  | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/73e22925/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 4559db2..ce78baf 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -1270,11 +1270,12 @@
             <artifactId>aopalliance</artifactId>
           </exclusion>
 
+            <!-- if this is uncommented out sends our service tier into bootloop -->
             <!-- blows up our version of guice-->
-            <exclusion>
-                <groupId>com.google.inject.extensions</groupId>
-                <artifactId>guice-assistedinject</artifactId>
-            </exclusion>
+            <!--<exclusion>-->
+                <!--<groupId>com.google.inject.extensions</groupId>-->
+                <!--<artifactId>guice-assistedinject</artifactId>-->
+            <!--</exclusion>-->
         </exclusions>
       </dependency>
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/73e22925/stack/services/src/test/java/org/apache/usergrid/services/ConnectionsServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/ConnectionsServiceIT.java
b/stack/services/src/test/java/org/apache/usergrid/services/ConnectionsServiceIT.java
index 57853a6..e281bf8 100644
--- a/stack/services/src/test/java/org/apache/usergrid/services/ConnectionsServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/services/ConnectionsServiceIT.java
@@ -63,6 +63,7 @@ public class ConnectionsServiceIT extends AbstractServiceIT {
         //DELETE users/conn-user1/manages/user2/conn-user2 (qualified by collection type
on second entity)
         app.testRequest( ServiceAction.DELETE, 1, "users", "conn-user1", "manages", "users",
"conn-user2" );
 
+        //TODO: test fails because the connections metadata is null. When before, data would
still be returned. 
         // "manages" connection removed from both entities
         user1 = app.testRequest( ServiceAction.GET, 1, "users", "conn-user1" ).getEntities().get(
0 );
         assertFalse( ( ( Map ) user1.getMetadata( "connections" ) ).containsKey( "manages"
) );


Mime
View raw message