Skip to content

Fix flaky TestManagedRegistry_externalLabels #2911

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
joe-elliott merged 5 commits into from
Sep 12, 2023
Merged

Fix flaky TestManagedRegistry_externalLabels #2911

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
78584db
fix flaky test TestManagedRegistry_externalLabels
LasseHels Sep 11, 2023
0051a96
Merge branch 'main' into fix-flaky-TestManagedRegistry_externalLabels
LasseHels Sep 11, 2023
9266373
Merge remote-tracking branch 'upstream/main' into fix-flaky-TestManag…
LasseHels Sep 12, 2023
bd14b09
order slices
LasseHels Sep 12, 2023
a7b3ad1
fix linter
LasseHels Sep 12, 2023
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
28 changes: 27 additions & 1 deletion modules/generator/registry/registry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@ package registry

import (
"context"
"fmt"
"math/rand"
"os"
"sort"
"testing"
"time"

"github.com/go-kit/log"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestManagedRegistry_concurrency(*testing.T) {
Expand Down Expand Up @@ -249,7 +252,30 @@ func collectRegistryMetricsAndAssert(t *testing.T, r *ManagedRegistry, appender

assert.Equal(t, true, appender.isCommitted)
assert.Equal(t, false, appender.isRolledback)
assert.ElementsMatch(t, expectedSamples, appender.samples)

actualSamples := appender.samples
require.Equal(t, len(expectedSamples), len(actualSamples))

// Ensure that both slices are ordered consistently.
for _, slice := range [][]sample{expectedSamples, actualSamples} {
sort.Slice(slice, func(i, j int) bool {
this := slice[i]
next := slice[j]

// The actual order doesn't matter, the only thing that matters is that it is consistent.
return this.String() < next.String()
})
}

for i, expected := range expectedSamples {
actual := actualSamples[i]

assert.Equal(t, expected.t, actual.t)
assert.Equal(t, expected.v, actual.v)
// Rely on the fact that Go prints map keys in sorted order.
// See https://tip.golang.org/doc/go1.12#fmt.
assert.Equal(t, fmt.Sprint(expected.l.Map()), fmt.Sprint(actual.l.Map()))
}
}

type mockOverrides struct {
Expand Down