Skip to content

Commit 10dc0bc

Browse files
perdasilvaPer G. da Silvaclaude
authored
fix(e2e): replace ${TEST_NAMESPACE} with plain text in feature files (#2614)
Replace interpolation-style `${TEST_NAMESPACE}` references with `test namespace` in Gherkin steps and remove the redundant step patterns that matched the `${TEST_NAMESPACE}` syntax, consolidating on the plain-text step definitions. Co-authored-by: Per G. da Silva <pegoncal@redhat.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent ba1e4cb commit 10dc0bc

File tree

7 files changed

+15
-16
lines changed

7 files changed

+15
-16
lines changed

‎test/e2e/features/install.feature‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Feature: Install ClusterExtension
66
Background:
77
Given OLM is available
88
And ClusterCatalog "test" serves bundles
9-
And ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
9+
And ServiceAccount "olm-sa" with needed permissions is available in test namespace
1010

1111
Scenario: Install latest available version
1212
When ClusterExtension is applied
@@ -595,7 +595,7 @@ Feature: Install ClusterExtension
595595
@BoxcutterRuntime
596596
@PreflightPermissions
597597
Scenario: Boxcutter preflight check detects missing CREATE permissions
598-
Given ServiceAccount "olm-sa" without create permissions is available in ${TEST_NAMESPACE}
598+
Given ServiceAccount "olm-sa" without create permissions is available in test namespace
599599
And ClusterExtension is applied
600600
"""
601601
apiVersion: olm.operatorframework.io/v1

‎test/e2e/features/recover.feature‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Feature: Recover cluster extension from errors that might occur during its lifet
55
And ClusterCatalog "test" serves bundles
66

77
Scenario: Restore removed resource
8-
Given ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
8+
Given ServiceAccount "olm-sa" with needed permissions is available in test namespace
99
And ClusterExtension is applied
1010
"""
1111
apiVersion: olm.operatorframework.io/v1
@@ -49,12 +49,12 @@ Feature: Recover cluster extension from errors that might occur during its lifet
4949
"olm.operatorframework.io/metadata.name": test-catalog
5050
"""
5151
And ClusterExtension reports Progressing as True with Reason Retrying
52-
When ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
52+
When ServiceAccount "olm-sa" with needed permissions is available in test namespace
5353
Then ClusterExtension is available
5454
And ClusterExtension reports Progressing as True with Reason Succeeded
5555

5656
Scenario: Install ClusterExtension after conflicting resource is removed
57-
Given ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
57+
Given ServiceAccount "olm-sa" with needed permissions is available in test namespace
5858
And resource is applied
5959
"""
6060
apiVersion: apps/v1
@@ -118,7 +118,7 @@ Feature: Recover cluster extension from errors that might occur during its lifet
118118
@PreflightPermissions
119119
Scenario: ClusterExtension installation succeeds after service account gets the required missing permissions to
120120
manage the bundle's resources
121-
Given ServiceAccount "olm-sa" is available in ${TEST_NAMESPACE}
121+
Given ServiceAccount "olm-sa" is available in test namespace
122122
And ClusterExtension is applied
123123
"""
124124
apiVersion: olm.operatorframework.io/v1
@@ -145,7 +145,7 @@ Feature: Recover cluster extension from errors that might occur during its lifet
145145
"""
146146
Namespace:"" APIGroups:[apiextensions.k8s.io] Resources:[customresourcedefinitions] ResourceNames:[olme2etests.olm.operatorframework.io] Verbs:[delete,get,patch,update]
147147
"""
148-
When ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
148+
When ServiceAccount "olm-sa" with needed permissions is available in test namespace
149149
Then ClusterExtension is available
150150
And ClusterExtension reports Progressing as True with Reason Succeeded
151151
And ClusterExtension reports Installed as True
@@ -163,7 +163,7 @@ Feature: Recover cluster extension from errors that might occur during its lifet
163163
# - If the controller stopped reconciling, the configmap would stay deleted
164164
# - Resource restoration is an observable event that PROVES active reconciliation
165165
# - The deployment staying healthy proves the workload continues running
166-
Given ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
166+
Given ServiceAccount "olm-sa" with needed permissions is available in test namespace
167167
And ClusterExtension is applied
168168
"""
169169
apiVersion: olm.operatorframework.io/v1
@@ -203,7 +203,7 @@ Feature: Recover cluster extension from errors that might occur during its lifet
203203
# - Reconciliation completing (observedGeneration == generation) proves the spec was processed
204204
# - Progressing=Succeeded proves the controller didn't block on missing catalog
205205
# - Extension staying Available proves workload continues running
206-
Given ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
206+
Given ServiceAccount "olm-sa" with needed permissions is available in test namespace
207207
And ClusterExtension is applied
208208
"""
209209
apiVersion: olm.operatorframework.io/v1

‎test/e2e/features/status.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Feature: Report status of the managed ClusterExtension workload
66
Background:
77
Given OLM is available
88
And ClusterCatalog "test" serves bundles
9-
And ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
9+
And ServiceAccount "olm-sa" with needed permissions is available in test namespace
1010
And ClusterExtension is applied
1111
"""
1212
apiVersion: olm.operatorframework.io/v1

‎test/e2e/features/uninstall.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Feature: Uninstall ClusterExtension
66
Background:
77
Given OLM is available
88
And ClusterCatalog "test" serves bundles
9-
And ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
9+
And ServiceAccount "olm-sa" with needed permissions is available in test namespace
1010
And ClusterExtension is applied
1111
"""
1212
apiVersion: olm.operatorframework.io/v1

‎test/e2e/features/update.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Feature: Update ClusterExtension
66
Background:
77
Given OLM is available
88
And ClusterCatalog "test" serves bundles
9-
And ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
9+
And ServiceAccount "olm-sa" with needed permissions is available in test namespace
1010

1111
Scenario: Update to a successor version
1212
Given ClusterExtension is applied

‎test/e2e/features/user-managed-fields.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Feature: Preserve user-managed fields on deployed resources
77
Background:
88
Given OLM is available
99
And ClusterCatalog "test" serves bundles
10-
And ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE}
10+
And ServiceAccount "olm-sa" with needed permissions is available in test namespace
1111
And ClusterExtension is applied
1212
"""
1313
apiVersion: olm.operatorframework.io/v1

‎test/e2e/steps/steps.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,8 @@ func RegisterSteps(sc *godog.ScenarioContext) {
126126

127127
sc.Step(`^(?i)ServiceAccount "([^"]*)" with permissions to install extensions is available in "([^"]*)" namespace$`, ServiceAccountWithNeededPermissionsIsAvailableInGivenNamespace)
128128
sc.Step(`^(?i)ServiceAccount "([^"]*)" with needed permissions is available in test namespace$`, ServiceAccountWithNeededPermissionsIsAvailableInTestNamespace)
129-
sc.Step(`^(?i)ServiceAccount "([^"]*)" with needed permissions is available in \${TEST_NAMESPACE}$`, ServiceAccountWithNeededPermissionsIsAvailableInTestNamespace)
130-
sc.Step(`^(?i)ServiceAccount "([^"]*)" without create permissions is available in \${TEST_NAMESPACE}$`, ServiceAccountWithoutCreatePermissionsIsAvailableInTestNamespace)
131-
sc.Step(`^(?i)ServiceAccount "([^"]*)" is available in \${TEST_NAMESPACE}$`, ServiceAccountIsAvailableInNamespace)
129+
sc.Step(`^(?i)ServiceAccount "([^"]*)" without create permissions is available in test namespace$`, ServiceAccountWithoutCreatePermissionsIsAvailableInTestNamespace)
130+
sc.Step(`^(?i)ServiceAccount "([^"]*)" is available in test namespace$`, ServiceAccountIsAvailableInNamespace)
132131
sc.Step(`^(?i)ServiceAccount "([^"]*)" in test namespace is cluster admin$`, ServiceAccountWithClusterAdminPermissionsIsAvailableInNamespace)
133132
sc.Step(`^(?i)ServiceAccount "([^"]+)" in test namespace has permissions to fetch "([^"]+)" metrics$`, ServiceAccountWithFetchMetricsPermissions)
134133
sc.Step(`^(?i)ServiceAccount "([^"]+)" sends request to "([^"]+)" endpoint of "([^"]+)" service$`, SendMetricsRequest)

0 commit comments

Comments
 (0)