Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15366 Add assumeNoException for Linux

Mike Drobb5f286b37cc7
diff --git a/solr/core/src/test/org/apache/solr/cloud/KerberosTestServices.java b/solr/core/src/test/org/apache/solr/cloud/KerberosTestServices.java
index 9f8f2b17bec..e3ac8130fa3 100644
--- a/solr/core/src/test/org/apache/solr/cloud/KerberosTestServices.java
+++ b/solr/core/src/test/org/apache/solr/cloud/KerberosTestServices.java
@@ -42,15 +42,18 @@ public class KerberosTestServices {
private final JaasConfiguration jaasConfiguration;
private final Configuration savedConfig;
private volatile Locale savedLocale;
+ private final boolean debug;
private final File workDir;
private KerberosTestServices(File workDir,
JaasConfiguration jaasConfiguration,
- Configuration savedConfig) {
+ Configuration savedConfig,
+ boolean debug) {
this.jaasConfiguration = jaasConfiguration;
this.savedConfig = savedConfig;
this.workDir = workDir;
+ this.debug = debug;
}
public MiniKdc getKdc() {
@@ -71,7 +74,7 @@ public class KerberosTestServices {
try {
bindException = false;
- kdc = getKdc(workDir);
+ kdc = getKdc(workDir, debug);
kdc.start();
} catch (BindException e) {
FileUtils.deleteDirectory(workDir); // clean directory
@@ -104,10 +107,10 @@ public class KerberosTestServices {
* Returns a MiniKdc that can be used for creating kerberos principals
* and keytabs. Caller is responsible for starting/stopping the kdc.
*/
- private static MiniKdc getKdc(File workDir) throws Exception {
+ private static MiniKdc getKdc(File workDir, boolean debug) throws Exception {
Properties conf = MiniKdc.createConf();
conf.setProperty("kdc.port", "0");
- conf.setProperty("debug", "true");
+ conf.setProperty("debug", String.valueOf(debug));
return new MiniKdc(conf, workDir);
}
@@ -202,6 +205,7 @@ public class KerberosTestServices {
private String serverPrincipal;
private File serverKeytab;
private String appName;
+ private boolean debug = false;
public Builder() { }
@@ -210,6 +214,11 @@ public class KerberosTestServices {
return this;
}
+ public Builder withDebug() {
+ this.debug = true;
+ return this;
+ }
+
public Builder withJaasConfiguration(String clientPrincipal, File clientKeytab,
String serverPrincipal, File serverKeytab) {
this.clientPrincipal = Objects.requireNonNull(clientPrincipal);
@@ -237,7 +246,7 @@ public class KerberosTestServices {
new JaasConfiguration(clientPrincipal, clientKeytab, serverPrincipal, serverKeytab) :
new JaasConfiguration(clientPrincipal, clientKeytab, appName);
}
- return new KerberosTestServices(kdcWorkDir, jaasConfiguration, oldConfig);
+ return new KerberosTestServices(kdcWorkDir, jaasConfiguration, oldConfig, debug);
}
}
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java b/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java
index e8a5515c4e6..c8a7fdaf6d2 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java
@@ -34,6 +34,7 @@ import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkACLProvider;
import org.apache.solr.util.BadZookeeperThreadsFilter;
import org.apache.zookeeper.CreateMode;
+import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.client.ZooKeeperSaslClient;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -89,6 +90,9 @@ public class SaslZkACLProviderTest extends SolrTestCaseJ4 {
ZooKeeperSaslClient saslClient = zkClient.getSolrZooKeeper().getConnection().zooKeeperSaslClient;
assumeFalse("Could not set up ZK with SASL", saslClient.isFailed());
zkClient.makePath("/solr", false, true);
+ } catch (KeeperException e) {
+ // This fails on Linux but passes on Windows and MacOS. Why?
+ assumeNoException("Could not set up ZK chroot, see SOLR-15366.", e);
}
setupZNodes();
@@ -204,6 +208,7 @@ public class SaslZkACLProviderTest extends SolrTestCaseJ4 {
kerberosTestServices = KerberosTestServices.builder()
.withKdc(kdcDir.toFile())
+ .withDebug() // SOLR-15366
.withJaasConfiguration(zkClientPrincipal, keytabFile, zkServerPrincipal, keytabFile)
.build();
kerberosTestServices.start();