Skip to content

Widen collector test timeouts and some cleansing. #8607

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
Jul 13, 2020
Merged

Widen collector test timeouts and some cleansing. #8607

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
17 changes: 8 additions & 9 deletions pkg/autoscaler/metrics/collector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ func TestMetricCollectorScraper(t *testing.T) {
mtp.Channel <- now
var gotRPS, gotConcurrency, panicRPS, panicConcurrency float64
// Poll to see that the async loop completed.
wait.PollImmediate(10*time.Millisecond, 100*time.Millisecond, func() (bool, error) {
wait.PollImmediate(10*time.Millisecond, 1*time.Second, func() (bool, error) {
gotConcurrency, panicConcurrency, _ = coll.StableAndPanicConcurrency(metricKey, now)
gotRPS, panicRPS, _ = coll.StableAndPanicRPS(metricKey, now)
return gotConcurrency == wantConcurrency &&
Expand All @@ -163,9 +163,10 @@ func TestMetricCollectorScraper(t *testing.T) {
panicRPS == wantPRPS, nil
})

gotConcurrency, panicConcurrency, _ = coll.StableAndPanicConcurrency(metricKey, now)
gotRPS, panicRPS, err := coll.StableAndPanicRPS(metricKey, now)
if err != nil {
if _, _, err := coll.StableAndPanicConcurrency(metricKey, now); err != nil {
t.Errorf("StableAndPanicConcurrency = %v", err)
}
if _, _, err := coll.StableAndPanicRPS(metricKey, now); err != nil {
t.Errorf("StableAndPanicRPS = %v", err)
}
if panicConcurrency != wantPConcurrency {
Expand All @@ -186,7 +187,7 @@ func TestMetricCollectorScraper(t *testing.T) {
mtp.Channel <- now

// Wait for async loop to finish.
wait.PollImmediate(10*time.Millisecond, 100*time.Millisecond, func() (bool, error) {
wait.PollImmediate(10*time.Millisecond, 1*time.Second, func() (bool, error) {
gotConcurrency, _, _ = coll.StableAndPanicConcurrency(metricKey, now.Add(defaultMetric.Spec.StableWindow).Add(-5*time.Second))
gotRPS, _, _ = coll.StableAndPanicRPS(metricKey, now.Add(defaultMetric.Spec.StableWindow).Add(-5*time.Second))
return gotConcurrency == reportConcurrency*5 && gotRPS == reportRPS*5, nil
Expand All @@ -200,12 +201,10 @@ func TestMetricCollectorScraper(t *testing.T) {

// Deleting the metric should cause a calculation error.
coll.Delete(defaultNamespace, defaultName)
_, _, err = coll.StableAndPanicConcurrency(metricKey, now)
if err != ErrNotCollecting {
if _, _, err := coll.StableAndPanicConcurrency(metricKey, now); err != ErrNotCollecting {
t.Errorf("StableAndPanicConcurrency() = %v, want %v", err, ErrNotCollecting)
}
_, _, err = coll.StableAndPanicRPS(metricKey, now)
if err != ErrNotCollecting {
if _, _, err := coll.StableAndPanicRPS(metricKey, now); err != ErrNotCollecting {
t.Errorf("StableAndPanicRPS() = %v, want %v", err, ErrNotCollecting)
}
}
Expand Down