You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2019/11/25 17:29:11 UTC
[tinkerpop] branch travis-fix updated: polish up
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch travis-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/travis-fix by this push:
new d114e1c polish up
d114e1c is described below
commit d114e1c15a0ccd3853a93b37494d77ac48989a3d
Author: stephen <sp...@gmail.com>
AuthorDate: Mon Nov 25 12:28:50 2019 -0500
polish up
---
.travis.yml | 2 +-
.../org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java | 2 +-
.../tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8208c7d..89a230f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,7 +45,7 @@ jobs:
name: "gremlin server"
- script:
- "mvn clean install -q -DskipTests"
- - "travis_wait 60 mvn verify -pl :gremlin-console -DskipIntegrationTests=false"
+ - "mvn verify -pl :gremlin-console -DskipIntegrationTests=false"
name: "gremlin console"
- script:
- "mvn clean install -q -DskipTests"
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
index cd5cf65..0cadc99 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
@@ -114,7 +114,7 @@ public class Krb5Authenticator implements Authenticator {
// GSSAPI is the only available mechanism for this authenticator
final Map props = new HashMap<String, Object>();
final String[] principalParts = principalName.split("/|@");
- if (principalParts.length < 3) throw new IllegalArgumentException("Use principal name of format 'service/fqdn@kdcrealm' - not this nonsense" + principalName);
+ if (principalParts.length < 3) throw new IllegalArgumentException("Use principal name of format 'service/fqdn@kdcrealm'");
saslServer = Sasl.createSaslServer(mechanism, principalParts[0], principalParts[1], props, Krb5SaslAuthenticator.this);
} catch(Exception e) {
logger.error("Creating sasl server failed: ", e);
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
index 9a3e4ff..de13d99 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java
@@ -327,7 +327,7 @@ public class GremlinServerSessionIntegrateTest extends AbstractGremlinServerInt
@Test
public void shouldEnsureSessionBindingsAreThreadSafe() throws Exception {
- final Cluster cluster = TestClientFactory.build().maxWaitForConnection(90000).
+ final Cluster cluster = TestClientFactory.build().
minInProcessPerConnection(16).maxInProcessPerConnection(64).create();
final Client client = cluster.connect(name.getMethodName());