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 2017/09/19 15:50:05 UTC
[2/3] tinkerpop git commit: Make the start script for test server a
bit more flexible
Make the start script for test server a bit more flexible
By passing the settings file itself as an argument python can use the "python-specific" configuration file. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/97aef329
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/97aef329
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/97aef329
Branch: refs/heads/master
Commit: 97aef32982d52c9b1f8ebc538f2770b92d290b1c
Parents: 217a44f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Sep 19 11:22:59 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Sep 19 11:22:59 2017 -0400
----------------------------------------------------------------------
gremlin-dotnet/test/pom.xml | 4 ++++
gremlin-python/pom.xml | 4 ++++
gremlin-server/src/test/scripts/README.asciidoc | 17 +++++++++++++++++
.../src/test/scripts/test-server-start.groovy | 4 ++--
4 files changed, 27 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/97aef329/gremlin-dotnet/test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/pom.xml b/gremlin-dotnet/test/pom.xml
index 7b82a2e..db585f4 100644
--- a/gremlin-dotnet/test/pom.xml
+++ b/gremlin-dotnet/test/pom.xml
@@ -138,6 +138,10 @@ limitations under the License.
<value>${gremlin.server.dir}</value>
</property>
<property>
+ <name>settingsFile</name>
+ <value>${gremlin.server.dir}/conf/gremlin-server-modern.yaml</value>
+ </property>
+ <property>
<name>executionName</name>
<value>${project.name}</value>
</property>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/97aef329/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index b60b867..379a114 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -514,6 +514,10 @@ limitations under the License.
<value>${gremlin.server.dir}</value>
</property>
<property>
+ <name>settingsFile</name>
+ <value>${gremlin.server.dir}/conf/gremlin-server-modern-py.yaml</value>
+ </property>
+ <property>
<name>executionName</name>
<value>${project.name}</value>
</property>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/97aef329/gremlin-server/src/test/scripts/README.asciidoc
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/scripts/README.asciidoc b/gremlin-server/src/test/scripts/README.asciidoc
new file mode 100644
index 0000000..f6ea434
--- /dev/null
+++ b/gremlin-server/src/test/scripts/README.asciidoc
@@ -0,0 +1,17 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+////
+This directory holds scripts used by other projects (e.g. GLVs) to start and stop instances of Gremlin Server.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/97aef329/gremlin-server/src/test/scripts/test-server-start.groovy
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/scripts/test-server-start.groovy b/gremlin-server/src/test/scripts/test-server-start.groovy
index 83efcd5..8ea08a9 100644
--- a/gremlin-server/src/test/scripts/test-server-start.groovy
+++ b/gremlin-server/src/test/scripts/test-server-start.groovy
@@ -24,7 +24,7 @@ import org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator
if (Boolean.parseBoolean(skipTests)) return
log.info("Starting Gremlin Server instances for native testing of ${executionName}")
-def settings = Settings.read("${gremlinServerDir}/conf/gremlin-server-modern-py.yaml")
+def settings = Settings.read("${settingsFile}")
settings.graphs.graph = gremlinServerDir + "/conf/tinkergraph-empty.properties"
settings.scriptEngines["gremlin-groovy"].scripts = [gremlinServerDir + "/scripts/generate-modern.groovy"]
settings.port = 45940
@@ -35,7 +35,7 @@ server.start().join()
project.setContextValue("gremlin.server", server)
log.info("Gremlin Server with no authentication started on port 45940")
-def settingsSecure = Settings.read("${gremlinServerDir}/conf/gremlin-server-modern.yaml")
+def settingsSecure = Settings.read("${settingsFile}")
settingsSecure.graphs.graph = gremlinServerDir + "/conf/tinkergraph-empty.properties"
settingsSecure.scriptEngines["gremlin-groovy"].scripts = [gremlinServerDir + "/scripts/generate-modern.groovy"]
settingsSecure.port = 45941