Skip to content

Commit cc663f6

Browse files
committed
upgrade status CLI monitortest: fix naming conflicts
1 parent 36d4917 commit cc663f6

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

pkg/monitortests/cli/adm_upgrade/status/controlplane_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/openshift/origin/pkg/test/ginkgo/junitapi"
1111
)
1212

13-
var exampleOutput = `Unable to fetch alerts, ignoring alerts in 'Update Health': failed to get alerts from Thanos: no token is currently in use for this session
13+
var cpExampleOutput = `Unable to fetch alerts, ignoring alerts in 'Update Health': failed to get alerts from Thanos: no token is currently in use for this session
1414
= Control Plane =
1515
Assessment: Progressing
1616
Target Version: 4.20.0-0.ci-2025-08-13-121604-test-ci-op-njttt0ww-latest (from 4.20.0-0.ci-2025-08-13-114210-test-ci-op-njttt0ww-initial)
@@ -44,7 +44,7 @@ ip-10-0-106-212.us-west-1.compute.internal Outdated Pending 4.20.0-0.ci-
4444
SINCE LEVEL IMPACT MESSAGE
4545
8m57s Info None Update is proceeding well`
4646

47-
var badOutput = `= Control Plane =
47+
var cpBadOutput = `= Control Plane =
4848
Assessment: Progressing
4949
Target Version: 4.20.0-0.ci-2025-08-13-121604-test-ci-op-njttt0ww-latest (from 4.20.0-0.ci-2025-08-13-114210-test-ci-op-njttt0ww-initial)
5050
Completion: 6% (2 operators updated, 1 updating, 31 waiting)
@@ -112,9 +112,9 @@ func TestMonitor_ControlPlane(t *testing.T) {
112112
{
113113
name: "good snapshots",
114114
snapshots: []snapshot{
115-
{when: time.Now(), out: exampleOutput},
116-
{when: time.Now(), out: exampleOutput},
117-
{when: time.Now(), out: exampleOutput},
115+
{when: time.Now(), out: cpExampleOutput},
116+
{when: time.Now(), out: cpExampleOutput},
117+
{when: time.Now(), out: cpExampleOutput},
118118
},
119119
expected: &junitapi.JUnitTestCase{
120120
Name: "[sig-cli][OCPFeatureGate:UpgradeStatus] oc adm upgrade status control plane section is consistent",
@@ -123,9 +123,9 @@ func TestMonitor_ControlPlane(t *testing.T) {
123123
{
124124
name: "errored snapshots are skipped",
125125
snapshots: []snapshot{
126-
{when: time.Now(), out: exampleOutput},
127-
{when: time.Now(), out: badOutput, err: errors.New("some error")},
128-
{when: time.Now(), out: exampleOutput},
126+
{when: time.Now(), out: cpExampleOutput},
127+
{when: time.Now(), out: cpBadOutput, err: errors.New("some error")},
128+
{when: time.Now(), out: cpExampleOutput},
129129
},
130130
expected: &junitapi.JUnitTestCase{
131131
Name: "[sig-cli][OCPFeatureGate:UpgradeStatus] oc adm upgrade status control plane section is consistent",
@@ -134,9 +134,9 @@ func TestMonitor_ControlPlane(t *testing.T) {
134134
{
135135
name: "unparseable snapshots are skipped",
136136
snapshots: []snapshot{
137-
{when: time.Now(), out: exampleOutput},
137+
{when: time.Now(), out: cpExampleOutput},
138138
{when: time.Now(), out: "unparseable output"},
139-
{when: time.Now(), out: exampleOutput},
139+
{when: time.Now(), out: cpExampleOutput},
140140
},
141141
expected: &junitapi.JUnitTestCase{
142142
Name: "[sig-cli][OCPFeatureGate:UpgradeStatus] oc adm upgrade status control plane section is consistent",

0 commit comments

Comments
 (0)