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 C0E8711236 for ; Thu, 28 Aug 2014 21:14:28 +0000 (UTC) Received: (qmail 57581 invoked by uid 500); 28 Aug 2014 21:14:28 -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 57571 invoked by uid 99); 28 Aug 2014 21:14:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Aug 2014 21:14:28 +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; Thu, 28 Aug 2014 21:14:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E84AC23888FE; Thu, 28 Aug 2014 21:14:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1621207 - /lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java Date: Thu, 28 Aug 2014 21:14:06 -0000 To: commits@lucene.apache.org From: thelabdude@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140828211406.E84AC23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: thelabdude Date: Thu Aug 28 21:14:06 2014 New Revision: 1621207 URL: http://svn.apache.org/r1621207 Log: SOLR-6443: Disable test that fails on Jenkins until we can determine the problem. Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java?rev=1621207&r1=1621206&r2=1621207&view=diff ============================================================================== --- lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java (original) +++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java Thu Aug 28 21:14:06 2014 @@ -24,6 +24,7 @@ import java.util.List; import java.util.Map; import org.apache.lucene.util.LuceneTestCase.Slow; +import org.apache.lucene.util.LuceneTestCase.AwaitsFix; import org.apache.solr.cloud.AbstractZkTestCase; import org.apache.solr.common.cloud.SolrZkClient; import org.apache.solr.common.util.NamedList; @@ -38,6 +39,7 @@ import org.junit.Test; * Depends on ZK for testing ZooKeeper backed storage logic. */ @Slow +@AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-6444") public class TestManagedResourceStorage extends AbstractZkTestCase { /** @@ -47,8 +49,8 @@ public class TestManagedResourceStorage public void testZkBasedJsonStorage() throws Exception { // test using ZooKeeper - assertTrue("Not using ZooKeeper", h.getCoreContainer().isZooKeeperAware()); - SolrZkClient zkClient = h.getCoreContainer().getZkController().getZkClient(); + assertTrue("Not using ZooKeeper", h.getCoreContainer().isZooKeeperAware()); + SolrZkClient zkClient = h.getCoreContainer().getZkController().getZkClient(); SolrResourceLoader loader = new SolrResourceLoader("./"); // Solr unit tests can only write to their working directory due to // a custom Java Security Manager installed in the test environment