Skip to content

Let net.Listen pick a port for grpc servers generated in tests #2310

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
merged 1 commit into from
Jul 31, 2021
Merged

Let net.Listen pick a port for grpc servers generated in tests #2310

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
22 changes: 10 additions & 12 deletions pkg/controller/registry/grpc/source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry"
)

func server(store opregistry.Query, port int) (func(), func()) {
lis, err := net.Listen("tcp", fmt.Sprintf("localhost:%d", port))
func server(store opregistry.Query) (func(), string, func()) {
lis, err := net.Listen("tcp", fmt.Sprintf("localhost:"))
if err != nil {
logrus.Fatalf("failed to listen: %v", err)
}
Expand All @@ -41,7 +41,7 @@ func server(store opregistry.Query, port int) (func(), func()) {
s.Stop()
}

return serve, stop
return serve, lis.Addr().String(), stop
}

type FakeSourceSyncer struct {
Expand Down Expand Up @@ -82,14 +82,14 @@ func TestConnectionEvents(t *testing.T) {

test := func(tt testcase) func(t *testing.T) {
return func(t *testing.T) {

// start server for each catalog
totalEvents := 0
port := 50050
for _, events := range tt.expectedHistory {
addresses := map[registry.CatalogKey]string{}

for catalog, events := range tt.expectedHistory {
totalEvents += len(events)
port += 1
serve, stop := server(&fakes.FakeQuery{}, port)
serve, address, stop := server(&fakes.FakeQuery{})
addresses[catalog] = address
go serve()
defer stop()
}
Expand All @@ -102,10 +102,8 @@ func TestConnectionEvents(t *testing.T) {
sources.Start(ctx)

// add source for each catalog
port = 50050
for catalog := range tt.expectedHistory {
port += 1
_, err := sources.Add(catalog, fmt.Sprintf("localhost:%d", port))
for catalog, address := range addresses {
_, err := sources.Add(catalog, address)
require.NoError(t, err)
}

Expand Down