This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 4a4896c ISSUE #879: TestTLS fails when project path contains spaces
4a4896c is described below
commit 4a4896c9b66741000c923b587ee1eafafca40273
Author: Sijie Guo <[email protected]>
AuthorDate: Tue Dec 19 00:24:00 2017 -0800
ISSUE #879: TestTLS fails when project path contains spaces
Descriptions of the changes in this PR:
Use `URI` rather than `URL`, so it won't use url-encoded path as the file
path.
Author: Sijie Guo <[email protected]>
Reviewers: Yiming Zang <[email protected]>, Enrico Olivelli
<[email protected]>
This closes #880 from sijie/relative_path, closes #879
---
.../test/java/org/apache/bookkeeper/tls/TestTLS.java | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/tls/TestTLS.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/tls/TestTLS.java
index 4613ebe..65cb7d1 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/tls/TestTLS.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/tls/TestTLS.java
@@ -83,25 +83,29 @@ public class TestTLS extends BookKeeperClusterTestCase {
baseClientConf.setTLSProviderFactoryClass(TLSContextFactory.class.getName());
baseClientConf.setTLSClientAuthentication(true);
baseClientConf.setTLSKeyStoreType("JKS");
-
baseClientConf.setTLSKeyStore(this.getClass().getClassLoader().getResource("client.jks").getPath());
+ baseClientConf.setTLSKeyStore(
+
this.getClass().getClassLoader().getResource("client.jks").toURI().getPath());
baseClientConf.setTLSKeyStorePasswordPath(
-
this.getClass().getClassLoader().getResource("keyStoreClientPassword.txt").getPath());
+
this.getClass().getClassLoader().getResource("keyStoreClientPassword.txt").toURI().getPath());
baseClientConf.setTLSTrustStoreType("JKS");
-
baseClientConf.setTLSTrustStore(this.getClass().getClassLoader().getResource("cacerts").getPath());
+ baseClientConf.setTLSTrustStore(
+
this.getClass().getClassLoader().getResource("cacerts").toURI().getPath());
baseClientConf.setTLSTrustStorePasswordPath(
-
this.getClass().getClassLoader().getResource("trustStorePassword.txt").getPath());
+
this.getClass().getClassLoader().getResource("trustStorePassword.txt").toURI().getPath());
/* server configuration */
baseConf.setTLSProviderFactoryClass(TLSContextFactory.class.getName());
baseConf.setTLSClientAuthentication(true);
baseConf.setTLSKeyStoreType("JKS");
-
baseConf.setTLSKeyStore(this.getClass().getClassLoader().getResource("server.jks").getPath());
+ baseConf.setTLSKeyStore(
+
this.getClass().getClassLoader().getResource("server.jks").toURI().getPath());
baseConf.setTLSKeyStorePasswordPath(
-
this.getClass().getClassLoader().getResource("keyStoreServerPassword.txt").getPath());
+
this.getClass().getClassLoader().getResource("keyStoreServerPassword.txt").toURI().getPath());
baseConf.setTLSTrustStoreType("JKS");
-
baseConf.setTLSTrustStore(this.getClass().getClassLoader().getResource("cacerts").getPath());
+ baseConf.setTLSTrustStore(
+
this.getClass().getClassLoader().getResource("cacerts").toURI().getPath());
baseConf.setTLSTrustStorePasswordPath(
-
this.getClass().getClassLoader().getResource("trustStorePassword.txt").getPath());
+
this.getClass().getClassLoader().getResource("trustStorePassword.txt").toURI().getPath());
super.setUp();
}
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
