This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit b6d1cfea7031a5fe8f279d6167135a45c7d644be Merge: 71685f4 3097a74 Author: Stephen Mallette <[email protected]> AuthorDate: Fri Oct 16 07:40:02 2020 -0400 Merge branch '3.4-dev' CHANGELOG.asciidoc | 3 +- .../jsr223/DriverRemoteAcceptorIntegrateTest.java | 15 +++ .../groovy/jsr223/ast/GremlinASTChecker.groovy | 128 +++++++++++++++++++++ .../gremlin/groovy/engine/GremlinExecutor.java | 8 +- .../engine/GremlinExecutorOverGraphTest.java | 32 ++++++ .../groovy/jsr223/ast/GremlinASTCheckerTest.java | 83 +++++++++++++ .../gremlin/server/GremlinDriverIntegrateTest.java | 10 +- .../server/GremlinServerAuthKrb5IntegrateTest.java | 13 +++ 8 files changed, 288 insertions(+), 4 deletions(-) diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java index b8e5f1e,1d49f35..922e7c3 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java @@@ -41,6 -41,8 +41,7 @@@ import org.apache.tinkerpop.gremlin.jsr import org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource; import org.apache.tinkerpop.gremlin.process.traversal.Bytecode; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; -import org.apache.tinkerpop.gremlin.server.channel.NioChannelizer; + import org.apache.tinkerpop.gremlin.server.handler.OpExecutorHandler; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.io.Storage; import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex; @@@ -1410,9 -1450,10 +1418,9 @@@ public class GremlinDriverIntegrateTes @Test public void shouldAliasTraversalSourceVariables() throws Exception { - final Cluster cluster = TestClientFactory.open(); + final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRYO_V3D0).create(); final Client client = cluster.connect(); - try { + try { - try { client.submit("g.addV().property('name','stephen')").all().get().get(0).getVertex(); fail("Should have tossed an exception because \"g\" is readonly in this context"); diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java index 476e962,985f90c..1486c1b --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java @@@ -52,14 -55,22 +53,22 @@@ public class GremlinServerAuthKrb5Integ static final String TESTCONSOLE_NOT_LOGGED_IN = "UserNotLoggedIn"; private KdcFixture kdcServer; + private Level previousLogLevel; - @Before @Override public void setUp() throws Exception { + // this logger is noisy for travis and we don't assert anything and the error is already tracked on + // the server so we can trim the logs a bit with this. + final org.apache.log4j.Logger handlerLogger = org.apache.log4j.Logger.getLogger( + "org.apache.tinkerpop.gremlin.driver.Handler$GremlinResponseHandler"); + previousLogLevel = handlerLogger.getLevel(); + handlerLogger.setLevel(Level.OFF); + try { - final String buildDir = System.getProperty("build.dir"); - kdcServer = new KdcFixture(buildDir + - "/test-classes/org/apache/tinkerpop/gremlin/server/gremlin-console-jaas.conf"); + final String projectBaseDir = System.getProperty("basedir"); + final String authConfigName = projectBaseDir + "/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-console-jaas.conf"; + System.setProperty("java.security.auth.login.config", authConfigName); + kdcServer = new KdcFixture(projectBaseDir); kdcServer.setUp(); } catch(Exception e) { logger.warn(e.getMessage()); @@@ -67,11 -78,11 +76,15 @@@ super.setUp(); } - @After - public void teardownForEachTest() { + @Override + public void tearDown() throws Exception { + final org.apache.log4j.Logger handlerLogger = org.apache.log4j.Logger.getLogger( + "org.apache.tinkerpop.gremlin.driver.Handler$GremlinResponseHandler"); + handlerLogger.setLevel(previousLogLevel); ++ + kdcServer.close(); + System.clearProperty("java.security.auth.login.config"); + super.tearDown(); } /**
