Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D3064D6B2 for ; Tue, 18 Dec 2012 16:11:51 +0000 (UTC) Received: (qmail 3062 invoked by uid 500); 18 Dec 2012 16:11:43 -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 2920 invoked by uid 99); 18 Dec 2012 16:11:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Dec 2012 16:11:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Dec 2012 16:11:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DD4AD2388A91; Tue, 18 Dec 2012 16:11:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1423507 - /lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java Date: Tue, 18 Dec 2012 16:11:19 -0000 To: commits@lucene.apache.org From: markrmiller@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121218161119.DD4AD2388A91@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markrmiller Date: Tue Dec 18 16:11:18 2012 New Revision: 1423507 URL: http://svn.apache.org/viewvc?rev=1423507&view=rev Log: harden test Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java?rev=1423507&r1=1423506&r2=1423507&view=diff ============================================================================== --- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java (original) +++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java Tue Dec 18 16:11:18 2012 @@ -303,10 +303,13 @@ public class OverseerTest extends SolrTe reader.updateClusterState(true); ClusterState state = reader.getClusterState(); Map slices = state.getSlicesMap("collection1"); - for (String name : slices.keySet()) { - cloudStateSliceCount += slices.get(name).getReplicasMap().size(); + if (slices != null) { + for (String name : slices.keySet()) { + cloudStateSliceCount += slices.get(name).getReplicasMap().size(); + } + if (coreCount == cloudStateSliceCount) break; } - if (coreCount == cloudStateSliceCount) break; + Thread.sleep(200); } assertEquals("Unable to verify all cores have been assigned an id in cloudstate",