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 18:52:56 UTC
[tinkerpop] 04/04: Break up server/console test builds for travis
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
commit ee70c9a1854e29b83889fae982b0196353ae640a
Author: stephen <sp...@gmail.com>
AuthorDate: Fri Nov 15 10:46:36 2019 -0500
Break up server/console test builds for travis
---
.travis.yml | 8 ++++++--
.../apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java | 2 +-
.../tinkerpop/gremlin/server/GremlinServerIntegrateTest.java | 2 +-
.../gremlin/server/GremlinServerSessionIntegrateTest.java | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e5f8621..89a230f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,8 +41,12 @@ jobs:
name: "javascript"
- script:
- "mvn clean install -q -DskipTests"
- - "travis_wait 60 mvn verify -pl :gremlin-server,:gremlin-console -DskipIntegrationTests=false"
- name: "gremlin server/console"
+ - "mvn verify -pl :gremlin-server -DskipTests -DskipIntegrationTests=false"
+ name: "gremlin server"
+ - script:
+ - "mvn clean install -q -DskipTests"
+ - "mvn verify -pl :gremlin-console -DskipIntegrationTests=false"
+ name: "gremlin console"
- script:
- "mvn clean install -q -DskipTests"
- "travis_wait 60 mvn verify -pl :spark-gremlin -DskipIntegrationTests=false"
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/GremlinServerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index cbb1f1f..5448a26 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@ -887,7 +887,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldFailOnDeadHost() throws Exception {
- final Cluster cluster = TestClientFactory.build().maxWaitForConnection(90000).create();
+ final Cluster cluster = TestClientFactory.build().create();
final Client client = cluster.connect();
// ensure that connection to server is good
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());