Skip to content

Commit cc57d96

Browse files
committed
vSphere snapshot options test should wait for operator to settle
1 parent 3ded19e commit cc57d96

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

test/extended/storage/driver_configuration.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
o "github.com/onsi/gomega"
1313
opv1 "github.com/openshift/api/operator/v1"
1414
exutil "github.com/openshift/origin/test/extended/util"
15+
util "github.com/openshift/origin/test/extended/util"
1516
"gopkg.in/ini.v1"
1617
v1 "k8s.io/api/core/v1"
1718
"k8s.io/apimachinery/pkg/api/resource"
@@ -140,6 +141,14 @@ var _ = g.Describe("[sig-storage][FeatureGate:VSphereDriverConfiguration][Serial
140141
g.It(fmt.Sprintf("%s", t.name), func() {
141142

142143
setClusterCSIDriverSnapshotOptions(ctx, oc, t.clusterCSIDriverOptions)
144+
145+
// Wait for operator to be Progressing=False to ensure all pod creation events complete before test ends.
146+
// This allows the pathological event matcher (newVsphereConfigurationTestsRollOutTooOftenEventMatcher in
147+
// pkg/monitortestlibrary/pathologicaleventlibrary/duplicated_event_patterns.go) to accurately attribute
148+
// pod events to this test's time window (interval); any events emitted later would not be matched.
149+
err := util.WaitForOperatorProgressingFalse(ctx, oc.AdminConfigClient(), providerName)
150+
o.Expect(err).NotTo(o.HaveOccurred())
151+
143152
o.Eventually(func() error {
144153
return loadAndCheckCloudConf(ctx, oc, "Snapshot", t.cloudConfigOptions, t.clusterCSIDriverOptions)
145154
}, pollTimeout, pollInterval).Should(o.Succeed())

0 commit comments

Comments
 (0)