lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hoss...@apache.org
Subject [44/50] [abbrv] lucene-solr git commit: SOLR-445: play nice with SOLR-8674 test changes
Date Thu, 25 Feb 2016 01:58:04 GMT
SOLR-445: play nice with SOLR-8674 test changes


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/bc5dfeef
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/bc5dfeef
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/bc5dfeef

Branch: refs/heads/jira/SOLR-445
Commit: bc5dfeeff1a182630fc3b55be3cf2f4fe164d446
Parents: a58ad2a
Author: Chris Hostetter <hossman@apache.org>
Authored: Tue Feb 23 14:28:09 2016 -0700
Committer: Chris Hostetter <hossman@apache.org>
Committed: Tue Feb 23 14:28:09 2016 -0700

----------------------------------------------------------------------
 .../apache/solr/cloud/TestTolerantUpdateProcessorCloud.java  | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bc5dfeef/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
index dcf720b..598d0f3 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
@@ -134,6 +134,9 @@ public class TestTolerantUpdateProcessorCloud extends LuceneTestCase {
 
   @BeforeClass
   private static void createMiniSolrCloudCluster() throws Exception {
+    // nocommit: should we just be subclassing SolrTestCaseJ4 and get this for free?
+    SolrTestCaseJ4.chooseMPForMP();
+    
     Builder jettyConfig = JettyConfig.builder();
     jettyConfig.waitForLoadingCoresToFinish(null);
     SOLR_CLUSTER = new MiniSolrCloudCluster(NUM_SERVERS, createTempDir(), jettyConfig.build());
@@ -171,6 +174,8 @@ public class TestTolerantUpdateProcessorCloud extends LuceneTestCase {
     for (Slice slice : clusterState.getSlices(COLLECTION_NAME)) {
       String shardName = slice.getName();
       Replica leader = slice.getLeader();
+      assertNotNull("slice has null leader: " + slice.toString(), leader);
+      assertNotNull("slice leader has null node name: " + slice.toString(), leader.getNodeName());
       String leaderUrl = urlMap.remove(leader.getNodeName());
       assertNotNull("could not find URL for " + shardName + " leader: " + leader.getNodeName(),
                     leaderUrl);
@@ -234,6 +239,9 @@ public class TestTolerantUpdateProcessorCloud extends LuceneTestCase {
   @AfterClass
   private static void shutdownMiniSolrCloudCluster() throws Exception {
     SOLR_CLUSTER.shutdown();
+
+    // nocommit: should we just be subclassing SolrTestCaseJ4 and get this for free?
+    SolrTestCaseJ4.unchooseMPForMP();
   }
   
   @Before


Mime
View raw message