svn commit: r1631146 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/ solr/core/src/test/org/apache/solr/TestGroupingSearch.java

[an...@apache.org]

Author: anshum
Date: Sun Oct 12 04:16:54 2014
New Revision: 1631146

URL: http://svn.apache.org/r1631146
Log:
SOLR-5986: Removing a todo that was introduced with a prior commit. It doesn't make any sense now as partialResults are now returned in all cases where timeAllowed kicks in (merge from trunk)

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/TestGroupingSearch.java

Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/TestGroupingSearch.java?rev=1631146&r1=1631145&r2=1631146&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/TestGroupingSearch.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/TestGroupingSearch.java Sun Oct 12 04:16:54 2014
@@ -278,9 +278,7 @@ public class TestGroupingSearch extends 
     assertU(commit());
 
     // Just checking if no errors occur
-    // TODO: Check if this makes any sense now that timeAllowed is also used during Terms enumeration.
-    //       The query can potentially timeout iterating over terms if this is set to too low.
-    assertJQ(req("q", "*:*", "group", "true", "group.query", "id:1", "group.query", "id:2", "timeAllowed", "100"));
+    assertJQ(req("q", "*:*", "group", "true", "group.query", "id:1", "group.query", "id:2", "timeAllowed", "1"));
   }
 
   @Test