You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by el...@apache.org on 2017/04/02 20:51:19 UTC
calcite-avatica git commit: [CALCITE-1736] Address test failures when
the path contains spaces
Repository: calcite-avatica
Updated Branches:
refs/heads/master 511910559 -> c42a01716
[CALCITE-1736] Address test failures when the path contains spaces
Project: http://git-wip-us.apache.org/repos/asf/calcite-avatica/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite-avatica/commit/c42a0171
Tree: http://git-wip-us.apache.org/repos/asf/calcite-avatica/tree/c42a0171
Diff: http://git-wip-us.apache.org/repos/asf/calcite-avatica/diff/c42a0171
Branch: refs/heads/master
Commit: c42a01716b13ac548c9e471a1bee85f713498547
Parents: 5119105
Author: Josh Elser <el...@apache.org>
Authored: Sun Apr 2 16:50:48 2017 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun Apr 2 16:50:48 2017 -0400
----------------------------------------------------------------------
.../src/test/java/org/apache/calcite/avatica/SpnegoTestUtil.java | 2 +-
.../org/apache/calcite/avatica/server/BasicAuthHttpServerTest.java | 2 +-
.../apache/calcite/avatica/server/DigestAuthHttpServerTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/c42a0171/server/src/test/java/org/apache/calcite/avatica/SpnegoTestUtil.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/calcite/avatica/SpnegoTestUtil.java b/server/src/test/java/org/apache/calcite/avatica/SpnegoTestUtil.java
index ab4491d..4edbfd1 100644
--- a/server/src/test/java/org/apache/calcite/avatica/SpnegoTestUtil.java
+++ b/server/src/test/java/org/apache/calcite/avatica/SpnegoTestUtil.java
@@ -111,7 +111,7 @@ public class SpnegoTestUtil {
writer.write(" com.sun.security.auth.module.Krb5LoginModule required\n");
writer.write(" principal=\"" + SERVER_PRINCIPAL + "\"\n");
writer.write(" useKeyTab=true\n");
- writer.write(" keyTab=\"" + serverKeytab.toURI() + "\"\n");
+ writer.write(" keyTab=\"" + serverKeytab.getPath() + "\"\n");
writer.write(" storeKey=true \n");
// Some extra debug information from JAAS
//writer.write(" debug=true\n");
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/c42a0171/server/src/test/java/org/apache/calcite/avatica/server/BasicAuthHttpServerTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/calcite/avatica/server/BasicAuthHttpServerTest.java b/server/src/test/java/org/apache/calcite/avatica/server/BasicAuthHttpServerTest.java
index 6f5f872..dd71aae 100644
--- a/server/src/test/java/org/apache/calcite/avatica/server/BasicAuthHttpServerTest.java
+++ b/server/src/test/java/org/apache/calcite/avatica/server/BasicAuthHttpServerTest.java
@@ -44,7 +44,7 @@ public class BasicAuthHttpServerTest extends HttpAuthBase {
@BeforeClass public static void startServer() throws Exception {
final String userPropertiesFile = BasicAuthHttpServerTest.class
- .getResource("/auth-users.properties").getFile();
+ .getResource("/auth-users.properties").getFile().replace("%20", " ");
assertNotNull("Could not find properties file for basic auth users", userPropertiesFile);
// Create a LocalService around HSQLDB
http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/c42a0171/server/src/test/java/org/apache/calcite/avatica/server/DigestAuthHttpServerTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/calcite/avatica/server/DigestAuthHttpServerTest.java b/server/src/test/java/org/apache/calcite/avatica/server/DigestAuthHttpServerTest.java
index 7277444..6db9993 100644
--- a/server/src/test/java/org/apache/calcite/avatica/server/DigestAuthHttpServerTest.java
+++ b/server/src/test/java/org/apache/calcite/avatica/server/DigestAuthHttpServerTest.java
@@ -44,7 +44,7 @@ public class DigestAuthHttpServerTest extends HttpAuthBase {
@BeforeClass public static void startServer() throws Exception {
final String userPropertiesFile = BasicAuthHttpServerTest.class
- .getResource("/auth-users.properties").getFile();
+ .getResource("/auth-users.properties").getFile().replace("%20", " ");
assertNotNull("Could not find properties file for digest auth users", userPropertiesFile);
// Create a LocalService around HSQLDB