Skip to content

Simplify minscale test. #7235

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

Merged
knative-prow-robot merged 1 commit into from
Mar 13, 2020
Merged

Simplify minscale test. #7235

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
15 changes: 5 additions & 10 deletions test/e2e/minscale_readiness_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ func TestMinScale(t *testing.T) {

// After update, ensure new revision holds minScale
t.Log("Hold minScale after update")
if err := ensureDesiredScale(clients, newServiceName, gte(minScale)); err != nil {
t.Fatalf("The revision %q did not stay at scale >= %d after creating route: %v", newRevName, minScale, err)
if !ensureDesiredScale(clients, newServiceName, gte(minScale)) {
t.Fatalf("The revision %q did not stay at scale >= %d after creating route", newRevName, minScale)
}

// After update, ensure old revision ignores minScale
Expand Down Expand Up @@ -211,13 +211,12 @@ func waitForDesiredScale(clients *test.Clients, serviceName string, cond func(in
}
return cond(resources.ReadyAddressCount(endpoint)), nil
})

}

func ensureDesiredScale(clients *test.Clients, serviceName string, cond func(int) bool) error {
func ensureDesiredScale(clients *test.Clients, serviceName string, cond func(int) bool) bool {
endpoints := clients.KubeClient.Kube.CoreV1().Endpoints(test.ServingNamespace)

if err := wait.PollImmediate(250*time.Millisecond, 5*time.Second, func() (bool, error) {
return wait.PollImmediate(250*time.Millisecond, 5*time.Second, func() (bool, error) {
endpoint, err := endpoints.Get(serviceName, metav1.GetOptions{})
if err != nil {
return false, nil
Expand All @@ -228,9 +227,5 @@ func ensureDesiredScale(clients *test.Clients, serviceName string, cond func(int
}

return false, nil
}); err != wait.ErrWaitTimeout {
return err
}

return nil
}) == wait.ErrWaitTimeout
}