You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by co...@apache.org on 2024/12/02 17:56:38 UTC
(tinkerpop) branch master updated: Update Python Feature Tests to always run gremlin-lang CTR
This is an automated email from the ASF dual-hosted git repository.
colegreer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/master by this push:
new 0eef27f7fc Update Python Feature Tests to always run gremlin-lang CTR
0eef27f7fc is described below
commit 0eef27f7fc39455d019e3a33cef6ea8a585aead7
Author: Cole-Greer <Co...@improving.com>
AuthorDate: Mon Dec 2 09:56:31 2024 -0800
Update Python Feature Tests to always run gremlin-lang CTR
---
.../src/main/python/radish/feature_steps.py | 7 ++-----
.../gremlin/test/features/map/MergeEdge.feature | 4 ----
.../gremlin/test/features/map/MergeVertex.feature | 8 --------
.../test/features/semantics/Comparability.feature | 24 +++++++++++-----------
.../test/features/semantics/Equality.feature | 4 ++--
.../test/features/semantics/Orderability.feature | 4 ++--
.../test/features/sideEffect/Aggregate.feature | 2 --
.../test/features/sideEffect/Inject.feature | 8 ++++----
.../gremlin/test/features/sideEffect/Store.feature | 2 --
9 files changed, 22 insertions(+), 41 deletions(-)
diff --git a/gremlin-python/src/main/python/radish/feature_steps.py b/gremlin-python/src/main/python/radish/feature_steps.py
index 27b50911de..6d3f03b935 100644
--- a/gremlin-python/src/main/python/radish/feature_steps.py
+++ b/gremlin-python/src/main/python/radish/feature_steps.py
@@ -139,14 +139,11 @@ def translate_traversal(step):
return
p = step.context.traversal_params if hasattr(step.context, "traversal_params") else {}
- localg = step.context.g
+ localg = step.context.g.with_('language', 'gremlin-lang')
tagset = [tag.name for tag in step.all_tags]
if "GraphComputerOnly" in tagset:
- localg = step.context.g.with_computer()
- if "GremlinLangScriptOnly" in tagset:
- # temporary tag used for tests that need gremlin-lang script processing before groovy script is removed
- localg = step.context.g.with_('language', 'gremlin-lang')
+ localg = step.context.g.with_('language', 'gremlin-lang').with_computer()
p['g'] = localg
step.context.traversal = step.context.traversals.pop(0)(**p)
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeEdge.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeEdge.feature
index a4053e00fa..ae252145b5 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeEdge.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeEdge.feature
@@ -145,7 +145,6 @@ Feature: Step - mergeE()
And the graph should return 0 for count of "g.E().properties()"
And the graph should return 1 for count of "g.V()"
- @GremlinLangScriptOnly
Scenario: g_V_mergeEXlabel_selfX_optionXonMatch_nullX
Given the empty graph
And the graph initializer of
@@ -164,7 +163,6 @@ Feature: Step - mergeE()
And the graph should return 0 for count of "g.E().properties()"
And the graph should return 1 for count of "g.V()"
- @GremlinLangScriptOnly
Scenario: g_V_mergeEXemptyX_optionXonCreate_nullX
Given the empty graph
And the graph initializer of
@@ -227,7 +225,6 @@ Feature: Step - mergeE()
And the graph should return 2 for count of "g.E()"
And the graph should return 2 for count of "g.V()"
- @GremlinLangScriptOnly
Scenario: g_mergeEXnullX
Given the empty graph
And the graph initializer of
@@ -242,7 +239,6 @@ Feature: Step - mergeE()
Then the traversal will raise an error with message containing text of "Out Vertex not specified"
# Directions not specified
- @GremlinLangScriptOnly
Scenario: g_V_mergeEXnullX
Given the empty graph
And the graph initializer of
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeVertex.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeVertex.feature
index 5cd3670e86..4d678ea1af 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeVertex.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeVertex.feature
@@ -102,7 +102,6 @@ Feature: Step - mergeV()
# - mergeV() that has a match to a vertex with multiproperties
# - results in all multiproperties removed to be replaced with one property
- @GremlinLangScriptOnly
Scenario: g_mergeVXemptyX_optionXonMatch_nullX
Given the empty graph
And the graph initializer of
@@ -117,7 +116,6 @@ Feature: Step - mergeV()
Then the result should have a count of 1
And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\").has(\"age\",29)"
- @GremlinLangScriptOnly
Scenario: g_V_mergeVXemptyX_optionXonMatch_nullX
Given the empty graph
And the graph initializer of
@@ -160,7 +158,6 @@ Feature: Step - mergeV()
When iterated to list
Then the traversal will raise an error
- @GremlinLangScriptOnly
Scenario: g_mergeVXlabel_person_name_stephenX_optionXonCreate_nullX
Given the empty graph
And the graph initializer of
@@ -178,7 +175,6 @@ Feature: Step - mergeV()
And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\")"
And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"stephen\")"
- @GremlinLangScriptOnly
Scenario: g_V_mergeVXlabel_person_name_stephenX_optionXonCreate_nullX
Given the empty graph
And the graph initializer of
@@ -196,7 +192,6 @@ Feature: Step - mergeV()
And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\")"
And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"stephen\")"
- @GremlinLangScriptOnly
Scenario: g_mergeVXnullX_optionXonCreate_emptyX
Given the empty graph
And the graph initializer of
@@ -211,7 +206,6 @@ Feature: Step - mergeV()
Then the result should have a count of 1
And the graph should return 1 for count of "g.V()"
- @GremlinLangScriptOnly
Scenario: g_V_mergeVXnullX_optionXonCreate_emptyX
Given the empty graph
And the graph initializer of
@@ -277,7 +271,6 @@ Feature: Step - mergeV()
And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"marko\").has(\"age\",29)"
And the graph should return 1 for count of "g.V().has(\"person\",\"name\",\"vadas\").has(\"age\",27)"
- @GremlinLangScriptOnly
Scenario: g_mergeVXnullX
Given the empty graph
And the graph initializer of
@@ -292,7 +285,6 @@ Feature: Step - mergeV()
Then the result should have a count of 1
And the graph should return 1 for count of "g.V()"
- @GremlinLangScriptOnly
Scenario: g_V_mergeVXnullX
Given the empty graph
And the graph initializer of
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/semantics/Comparability.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/semantics/Comparability.feature
index f687311d29..ed44775b77 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/semantics/Comparability.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/semantics/Comparability.feature
@@ -865,7 +865,7 @@ Feature: Comparability
## Infinity vs. Infinity
######################################################
- @GraphComputerVerificationInjectionNotSupported @GremlinLangScriptOnly
+ @GraphComputerVerificationInjectionNotSupported
Scenario: InjectXInfX_eqXInfX
Given the empty graph
And the traversal of
@@ -877,7 +877,7 @@ Feature: Comparability
| result |
| d[Infinity] |
- @GraphComputerVerificationInjectionNotSupported @GremlinLangScriptOnly
+ @GraphComputerVerificationInjectionNotSupported
Scenario: InjectXInfArgX_eqXInfX
Given the empty graph
And using the parameter xx1 defined as "d[Infinity]"
@@ -890,7 +890,7 @@ Feature: Comparability
| result |
| d[Infinity] |
- @GraphComputerVerificationInjectionNotSupported @GremlinLangScriptOnly
+ @GraphComputerVerificationInjectionNotSupported
Scenario: InjectXInfX_neqXInfX
Given the empty graph
And the traversal of
@@ -900,7 +900,7 @@ Feature: Comparability
When iterated to list
Then the result should be empty
- @GraphComputerVerificationInjectionNotSupported @GremlinLangScriptOnly
+ @GraphComputerVerificationInjectionNotSupported
Scenario: InjectXInfArgX_neqXInfX
Given the empty graph
And using the parameter xx1 defined as "d[Infinity]"
@@ -911,7 +911,7 @@ Feature: Comparability
When iterated to list
Then the result should be empty
- @GraphComputerVerificationInjectionNotSupported @GremlinLangScriptOnly
+ @GraphComputerVerificationInjectionNotSupported
Scenario: InjectXNegInfX_eqXNegInfX
Given the empty graph
And the traversal of
@@ -923,7 +923,7 @@ Feature: Comparability
| result |
| d[-Infinity] |
- @GraphComputerVerificationInjectionNotSupported @GremlinLangScriptOnly
+ @GraphComputerVerificationInjectionNotSupported
Scenario: InjectXNegInfArgX_eqXNegInfX
Given the empty graph
And using the parameter xx1 defined as "d[-Infinity]"
@@ -936,7 +936,7 @@ Feature: Comparability
| result |
| d[-Infinity] |
- @GraphComputerVerificationInjectionNotSupported @GremlinLangScriptOnly
+ @GraphComputerVerificationInjectionNotSupported
Scenario: InjectXNegInfX_neqXNegInfX
Given the empty graph
And the traversal of
@@ -946,7 +946,7 @@ Feature: Comparability
When iterated to list
Then the result should be empty
- @GraphComputerVerificationInjectionNotSupported @GremlinLangScriptOnly
+ @GraphComputerVerificationInjectionNotSupported
Scenario: InjectXNegInfArgX_neqXNegInfX
Given the empty graph
And using the parameter xx1 defined as "d[-Infinity]"
@@ -957,7 +957,7 @@ Feature: Comparability
When iterated to list
Then the result should be empty
- @GraphComputerVerificationInjectionNotSupported @GremlinLangScriptOnly
+ @GraphComputerVerificationInjectionNotSupported
Scenario: InjectXInfX_gtXNegInfX
Given the empty graph
And the traversal of
@@ -969,7 +969,7 @@ Feature: Comparability
| result |
| d[Infinity] |
- @GraphComputerVerificationInjectionNotSupported @GremlinLangScriptOnly
+ @GraphComputerVerificationInjectionNotSupported
Scenario: InjectXInfX_ltXNegInfX
Given the empty graph
And the traversal of
@@ -979,7 +979,7 @@ Feature: Comparability
When iterated to list
Then the result should be empty
- @GraphComputerVerificationInjectionNotSupported @GremlinLangScriptOnly
+ @GraphComputerVerificationInjectionNotSupported
Scenario: InjectXNegInfX_ltXInfX
Given the empty graph
And the traversal of
@@ -991,7 +991,7 @@ Feature: Comparability
| result |
| d[-Infinity] |
- @GraphComputerVerificationInjectionNotSupported @GremlinLangScriptOnly
+ @GraphComputerVerificationInjectionNotSupported
Scenario: InjectXNegInfX_gtXInfX
Given the empty graph
And the traversal of
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/semantics/Equality.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/semantics/Equality.feature
index a7eee482a6..58a1439266 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/semantics/Equality.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/semantics/Equality.feature
@@ -102,7 +102,7 @@ Feature: Equality
| d[1].m |
| d[1].b |
- @GraphComputerVerificationInjectionNotSupported @GremlinLangScriptOnly
+ @GraphComputerVerificationInjectionNotSupported
Scenario: Primitives_Number_eqXbigintX
Given the empty graph
And using the parameter xx1 defined as "l[d[1].b,d[1].s,d[1].i,d[1].l,d[1].f,d[1].d,d[1000].i,d[1].m,d[1].n]"
@@ -165,7 +165,7 @@ Feature: Equality
| d[1].m |
| d[1].b |
- @GraphComputerVerificationInjectionNotSupported @GremlinLangScriptOnly
+ @GraphComputerVerificationInjectionNotSupported
Scenario: Primitives_Number_eqXbigdecimalX
Given the empty graph
And using the parameter xx1 defined as "l[d[1].b,d[1].s,d[1].i,d[1].l,d[1].f,d[1].d,d[1000].i,d[1].m,d[1].n]"
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/semantics/Orderability.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/semantics/Orderability.feature
index 025ad8c30b..2d86759aba 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/semantics/Orderability.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/semantics/Orderability.feature
@@ -118,7 +118,7 @@ Feature: Orderability
| d[0.4].d |
| d[0.2].d |
- @GraphComputerVerificationInjectionNotSupported @GremlinLangScriptOnly
+ @GraphComputerVerificationInjectionNotSupported
Scenario: g_inject_order
Given the empty graph
And using the parameter xx1 defined as "null"
@@ -161,7 +161,7 @@ Feature: Orderability
| m[{"a":"a", "b":false, "c":"c"}] |
| m[{"a":"a", "b":"b"}] |
- @GraphComputerVerificationInjectionNotSupported @GremlinLangScriptOnly
+ @GraphComputerVerificationInjectionNotSupported
Scenario: g_inject_order_byXdescX
Given the empty graph
And using the parameter xx1 defined as "null"
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/sideEffect/Aggregate.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/sideEffect/Aggregate.feature
index 2caef1840f..5729709a89 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/sideEffect/Aggregate.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/sideEffect/Aggregate.feature
@@ -172,7 +172,6 @@ Feature: Step - aggregate()
| lop |
| josh |
- @GremlinLangScriptOnly
Scenario: g_withSideEffectXa_setX_V_both_name_aggregateXlocal_aX_capXaX
Given the modern graph
And using the parameter xx1 defined as "s[]"
@@ -185,7 +184,6 @@ Feature: Step - aggregate()
| result |
| s[marko,vadas,lop,josh,ripple,peter] |
- @GremlinLangScriptOnly
Scenario: g_withSideEffectXa_set_inlineX_V_both_name_aggregateXlocal_aX_capXaX
Given the modern graph
And the traversal of
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/sideEffect/Inject.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/sideEffect/Inject.feature
index e0ee920bef..762f9cff5d 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/sideEffect/Inject.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/sideEffect/Inject.feature
@@ -112,7 +112,7 @@ Feature: Step - inject()
| result |
| m[{"name":"marko", "age":null}] |
- @GraphComputerVerificationInjectionNotSupported @GremlinLangScriptOnly
+ @GraphComputerVerificationInjectionNotSupported
Scenario: g_injectXnull_nullX
Given the modern graph
And the traversal of
@@ -147,7 +147,7 @@ Feature: Step - inject()
When iterated to list
Then the result should be empty
- @GraphComputerVerificationInjectionNotSupported @GremlinLangScriptOnly
+ @GraphComputerVerificationInjectionNotSupported
Scenario: g_VX1X_valuesXageX_injectXnull_nullX
Given the modern graph
And using the parameter xx1 defined as "v[marko].id"
@@ -231,7 +231,7 @@ Feature: Step - inject()
| result |
| l[d[1].i,d[3].i,d[100].i,d[300].i] |
- @GraphComputerVerificationInjectionNotSupported @GremlinLangScriptOnly
+ @GraphComputerVerificationInjectionNotSupported
Scenario: g_injectX1_3_100_300X_set
Given the modern graph
And the traversal of
@@ -243,7 +243,7 @@ Feature: Step - inject()
| result |
| s[d[100].i,d[300].i,d[1].i,d[3].i] |
- @GraphComputerVerificationInjectionNotSupported @GremlinLangScriptOnly
+ @GraphComputerVerificationInjectionNotSupported
Scenario: g_injectX1_1X_set
Given the modern graph
And the traversal of
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/sideEffect/Store.feature b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/sideEffect/Store.feature
index 892f5ec3c7..00961ba703 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/sideEffect/Store.feature
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/sideEffect/Store.feature
@@ -49,7 +49,6 @@ Feature: Step - store()
| lop |
| josh |
- @GremlinLangScriptOnly
Scenario: g_withSideEffectXa_setX_V_both_name_storeXaX_capXaX
Given the modern graph
And using the parameter xx1 defined as "s[]"
@@ -62,7 +61,6 @@ Feature: Step - store()
| result |
| s[marko,vadas,lop,josh,ripple,peter] |
- @GremlinLangScriptOnly
Scenario: g_withSideEffectXa_set_inlineX_V_both_name_storeXaX_capXaX
Given the modern graph
And the traversal of