You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2016/11/27 15:48:36 UTC
lucene-solr:branch_6x: SOLR-5260 merge error
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 523b6b1b9 -> 736c9ff8e
SOLR-5260 merge error
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/736c9ff8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/736c9ff8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/736c9ff8
Branch: refs/heads/branch_6x
Commit: 736c9ff8e33019ba5f29f464629ad501f915b383
Parents: 523b6b1
Author: Erick Erickson <er...@apache.org>
Authored: Sun Nov 27 07:48:27 2016 -0800
Committer: Erick Erickson <er...@apache.org>
Committed: Sun Nov 27 07:48:27 2016 -0800
----------------------------------------------------------------------
.../apache/solr/cloud/DocValuesNotIndexedTest.java | 17 -----------------
1 file changed, 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/736c9ff8/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java b/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java
index b724e6d..b8507b1 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java
@@ -256,23 +256,6 @@ public class DocValuesNotIndexedTest extends SolrCloudTestCase {
for (int idx = 0; idx < res.size(); ++idx) {
if (prop.getName().startsWith("bool")) expected = orderBool[idx];
else expected = order[idx];
- //nocommit
- if (res.get(idx).get("id").equals(expected) == false) {
- for (int jdx = 0; jdx < order.length; ++jdx) {
- System.out.println(String.format("EOEOE Val in doc %s for field %s is %s",
- res.get(jdx).get("id"),
- prop.getName(),
- res.get(jdx).get(prop.getName())));
- }
- for (int jdx = 0; jdx < order.length; ++jdx) {
- System.out.println(String.format("EOEOE order pos %d is %s", jdx, order[jdx]));
- }
-
- for (int jdx = 0; jdx < orderBool.length; ++jdx) {
- System.out.println(String.format("EOEOE bool order pos %d is %s", jdx, orderBool[jdx]));
- }
-
- }
assertEquals("Documents in wrong order for field: " + prop.getName(),
expected, res.get(idx).get("id"));
}