Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9BFB8200D50 for ; Mon, 4 Dec 2017 08:29:53 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 9A908160C05; Mon, 4 Dec 2017 07:29:53 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E33EB160BF9 for ; Mon, 4 Dec 2017 08:29:52 +0100 (CET) Received: (qmail 34728 invoked by uid 500); 4 Dec 2017 07:29:52 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 34719 invoked by uid 99); 4 Dec 2017 07:29:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Dec 2017 07:29:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CD2EDE0219; Mon, 4 Dec 2017 07:29:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: varun@apache.org To: commits@lucene.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: lucene-solr:branch_7x: SOLR-11713: Fixed CdcrUpdateLogTest.testSubReader() failure which was a test bug Date: Mon, 4 Dec 2017 07:29:51 +0000 (UTC) archived-at: Mon, 04 Dec 2017 07:29:53 -0000 Repository: lucene-solr Updated Branches: refs/heads/branch_7x 7d4c444e9 -> 9e162e917 SOLR-11713: Fixed CdcrUpdateLogTest.testSubReader() failure which was a test bug (cherry picked from commit 2ed0f1b) Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9e162e91 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9e162e91 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9e162e91 Branch: refs/heads/branch_7x Commit: 9e162e917348bba5800c8ced5635dabc06ddb7f9 Parents: 7d4c444 Author: Varun Thacker Authored: Mon Dec 4 01:17:51 2017 -0800 Committer: Varun Thacker Committed: Sun Dec 3 23:29:44 2017 -0800 ---------------------------------------------------------------------- solr/CHANGES.txt | 2 ++ solr/core/src/test/org/apache/solr/update/CdcrUpdateLogTest.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9e162e91/solr/CHANGES.txt ---------------------------------------------------------------------- diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 5fa0d74..c97560c 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -205,6 +205,8 @@ Other Changes * SOLR-11291: Factor out abstract metrics/SolrCore[Container]Reporter classes. (Omar Abdelnabi, Christine Poerschke) +* SOLR-11713: Fixed CdcrUpdateLogTest.testSubReader() failure which was a test bug (Varun Thacker, Amrit Sarkar) + ================== 7.1.0 ================== Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9e162e91/solr/core/src/test/org/apache/solr/update/CdcrUpdateLogTest.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/update/CdcrUpdateLogTest.java b/solr/core/src/test/org/apache/solr/update/CdcrUpdateLogTest.java index b7409d1..002cfa5 100644 --- a/solr/core/src/test/org/apache/solr/update/CdcrUpdateLogTest.java +++ b/solr/core/src/test/org/apache/solr/update/CdcrUpdateLogTest.java @@ -580,8 +580,8 @@ public class CdcrUpdateLogTest extends SolrTestCaseJ4 { // After fast forward, the parent reader should be position on the doc15 List o = (List) reader.next(); assertNotNull(o); - assertTrue(o.get(2) instanceof SolrInputDocument); - assertEquals("15", ((SolrInputDocument) o.get(2)).getFieldValue("id")); + assertTrue("Expected SolrInputDocument but got" + o.toString() ,o.get(3) instanceof SolrInputDocument); + assertEquals("15", ((SolrInputDocument) o.get(3)).getFieldValue("id")); // Finish to read the second tlog, and start to read the third one for (int i = 0; i < 6; i++) {