Skip to content

🐛 increase eventually timeout to reduce false negatives #1619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

🐛 increase eventually timeout to reduce false negatives #1619

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions test/upgrade-e2e/post_upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ import (
catalogd "github.com/operator-framework/operator-controller/catalogd/api/v1"
)

const (
eventuallyTimeout = 3 * time.Minute
eventuallyPollPeriod = time.Second
)

func TestClusterExtensionAfterOLMUpgrade(t *testing.T) {
t.Log("Starting checks after OLM upgrade")
ctx := context.Background()
Expand All @@ -41,7 +46,7 @@ func TestClusterExtensionAfterOLMUpgrade(t *testing.T) {
managerDeployment.Status.AvailableReplicas == *managerDeployment.Spec.Replicas &&
managerDeployment.Status.ReadyReplicas == *managerDeployment.Spec.Replicas,
)
}, time.Minute, time.Second)
}, eventuallyTimeout, eventuallyPollPeriod)

var managerPods corev1.PodList
t.Log("Waiting for only one controller-manager Pod to remain")
Expand Down Expand Up @@ -72,7 +77,7 @@ func TestClusterExtensionAfterOLMUpgrade(t *testing.T) {
}
assert.Equal(ct, metav1.ConditionTrue, cond.Status)
assert.Equal(ct, catalogd.ReasonAvailable, cond.Reason)
}, time.Minute, time.Second)
}, eventuallyTimeout, eventuallyPollPeriod)

t.Log("Checking that the ClusterExtension is installed")
var clusterExtension ocv1.ClusterExtension
Expand All @@ -88,7 +93,7 @@ func TestClusterExtensionAfterOLMUpgrade(t *testing.T) {
if assert.NotNil(ct, clusterExtension.Status.Install) {
assert.NotEmpty(ct, clusterExtension.Status.Install.Bundle.Version)
}
}, time.Minute, time.Second)
}, eventuallyTimeout, eventuallyPollPeriod)

previousVersion := clusterExtension.Status.Install.Bundle.Version

Expand All @@ -108,7 +113,7 @@ func TestClusterExtensionAfterOLMUpgrade(t *testing.T) {
assert.Contains(ct, cond.Message, "Installed bundle")
assert.Equal(ct, ocv1.BundleMetadata{Name: "test-operator.1.0.1", Version: "1.0.1"}, clusterExtension.Status.Install.Bundle)
assert.NotEqual(ct, previousVersion, clusterExtension.Status.Install.Bundle.Version)
}, time.Minute, time.Second)
}, eventuallyTimeout, eventuallyPollPeriod)
}

func watchPodLogsForSubstring(ctx context.Context, pod *corev1.Pod, container string, substrings ...string) (bool, error) {
Expand Down
Loading