You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by th...@apache.org on 2020/09/02 18:42:57 UTC
[lucene-solr] branch reference_impl_dev updated: Un-ignore passing
solrj tests
This is an automated email from the ASF dual-hosted git repository.
thelabdude pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/reference_impl_dev by this push:
new dd8b56d Un-ignore passing solrj tests
dd8b56d is described below
commit dd8b56d6d46e70f11f3a5134b93f27235bfd68dc
Author: Timothy Potter <th...@gmail.com>
AuthorDate: Wed Sep 2 12:42:41 2020 -0600
Un-ignore passing solrj tests
---
.../org/apache/solr/client/solrj/GetByIdTest.java | 2 +-
.../solr/client/solrj/TestLBHttp2SolrClient.java | 3 ++-
.../solr/client/solrj/TestLBHttpSolrClient.java | 28 +++++++++++-----------
.../solrj/impl/CloudHttp2SolrClientTest.java | 1 -
.../solrj/impl/CloudSolrClientBuilderTest.java | 2 --
.../client/solrj/impl/CloudSolrClientTest.java | 1 -
.../solr/client/solrj/impl/HttpClientUtilTest.java | 3 +--
.../solr/client/solrj/request/TestLukeRequest.java | 2 --
8 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/GetByIdTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/GetByIdTest.java
index fe31875..c082f82 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/GetByIdTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/GetByIdTest.java
@@ -28,7 +28,7 @@ import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-@Ignore // nocommit flakey leaks
+//@Ignore // nocommit flakey leaks
public class GetByIdTest extends EmbeddedSolrServerTestBase {
@BeforeClass
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java
index a2e380f..4a6f232 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java
@@ -31,6 +31,7 @@ import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
import junit.framework.Assert;
import org.apache.commons.io.FileUtils;
import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.lucene.util.QuickPatchThreadsFilter;
import org.apache.solr.SolrIgnoredThreadsFilter;
@@ -61,7 +62,7 @@ import org.slf4j.LoggerFactory;
SolrIgnoredThreadsFilter.class,
QuickPatchThreadsFilter.class
})
-@Ignore // nocommit this leaks a client
+@LuceneTestCase.Nightly
public class TestLBHttp2SolrClient extends SolrTestCaseJ4 {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
index 6fe1b29..6eeef85 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
@@ -16,6 +16,17 @@
*/
package org.apache.solr.client.solrj;
+import java.io.File;
+import java.io.IOException;
+import java.lang.invoke.MethodHandles;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
import junit.framework.Assert;
import org.apache.commons.io.FileUtils;
@@ -29,7 +40,6 @@ import org.apache.solr.client.solrj.embedded.JettyConfig;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.Http2SolrClient;
import org.apache.solr.client.solrj.impl.HttpClientUtil;
-import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.impl.LBHttp2SolrClient;
import org.apache.solr.client.solrj.impl.LBHttpSolrClient;
import org.apache.solr.client.solrj.response.QueryResponse;
@@ -39,21 +49,10 @@ import org.apache.solr.common.util.TimeSource;
import org.apache.solr.util.TimeOut;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
-import java.io.IOException;
-import java.lang.invoke.MethodHandles;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
/**
* Test for LBHttpSolrClient
*
@@ -64,7 +63,6 @@ import java.util.concurrent.TimeUnit;
SolrIgnoredThreadsFilter.class,
QuickPatchThreadsFilter.class
})
-@Ignore // nocommit debug - can hang
public class TestLBHttpSolrClient extends SolrTestCaseJ4 {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -182,6 +180,8 @@ public class TestLBHttpSolrClient extends SolrTestCaseJ4 {
}
}
+ @Test
+ @Nightly // very slow ~ not sure if this is by design ...
public void testTwoServers() throws Exception {
try (LBHttp2SolrClient client = getLBHttpSolrClient(solr[0].getUrl(), solr[1].getUrl())) {
client.setAliveCheckInterval(50);
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java
index e602938..8d8650e 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java
@@ -249,7 +249,6 @@ public class CloudHttp2SolrClientTest extends SolrCloudTestCase {
}
@Test
- @Ignore // nocommit ~ still failing
public void testRouting() throws Exception {
createTestCollection("routing_collection", 2, 1);
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientBuilderTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientBuilderTest.java
index 04a9d83..4051b85 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientBuilderTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientBuilderTest.java
@@ -25,10 +25,8 @@ import java.util.Optional;
import org.apache.solr.SolrTestCase;
import org.apache.solr.client.solrj.impl.CloudSolrClient.Builder;
-import org.junit.Ignore;
import org.junit.Test;
-@Ignore // nocommit debug
public class CloudSolrClientBuilderTest extends SolrTestCase {
private static final String ANY_CHROOT = "/ANY_CHROOT";
private static final String ANY_ZK_HOST = "ANY_ZK_HOST";
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
index 4d783d2..c89bc5e 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
@@ -856,7 +856,6 @@ public class CloudSolrClientTest extends SolrCloudTestCase {
}
@Test
- //@Ignore // nocommit ~ possible regression
public void testRetryUpdatesWhenClusterStateIsStale() throws Exception {
final String COL = "stale_state_test_col";
assert cluster.getJettySolrRunners().size() >= 2;
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java
index b26f5f0..5ca6e70 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java
@@ -35,7 +35,6 @@ import org.junit.Rule;
import org.junit.rules.TestRule;
import org.junit.Test;
-@Ignore // nocommit debug
public class HttpClientUtilTest extends SolrTestCase {
@Rule
@@ -48,7 +47,7 @@ public class HttpClientUtilTest extends SolrTestCase {
}
@Test
- // commented out on: 24-Dec-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 20-Sep-2018
+ @Ignore // nocommit ~ check SSL related sys prop changes affecting this test
public void testSSLSystemProperties() throws IOException {
assertNotNull("HTTPS scheme could not be created using system defaults",
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestLukeRequest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestLukeRequest.java
index f5807ef..7e47f5d 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestLukeRequest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestLukeRequest.java
@@ -19,10 +19,8 @@ package org.apache.solr.client.solrj.request;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.params.SolrParams;
-import org.junit.Ignore;
import org.junit.Test;
-@Ignore // nocommit debug
public class TestLukeRequest extends SolrTestCaseJ4 {
@Test
public void testSkipsIncludeIndexFieldFlagsParamWhenNotSpecified() {