3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-04-30 10:56:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix flaky registry test (#1911)

Browse source
This commit is contained in:
wasaga 2021-02-17 20:17:42 -05:00 • committed by GitHub
parent b1baa5ac6d
commit c02223a8f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
internal/registry/server_test.go
View file

@ -208,9 +208,15 @@ func (c *cancelAll) Cancel() {
type serviceList []*pb.Service type serviceList []*pb.Service
func (l serviceList) Len() int { return len(l) } func (l serviceList) Len() int { return len(l) }
func (l serviceList) Less(i, j int) bool { return l[i].Kind < l[j].Kind } func (l serviceList) Less(i, j int) bool {
func (l serviceList) Swap(i, j int) { t := l[i]; l[i] = l[j]; l[j] = t } if l[i].Kind == l[j].Kind {
return l[i].Endpoint < l[j].Endpoint
}
return l[i].Kind < l[j].Kind
}
func (l serviceList) Swap(i, j int) { t := l[i]; l[i] = l[j]; l[j] = t }
func assertEqual(t *testing.T, want, got []*pb.Service) { func assertEqual(t *testing.T, want, got []*pb.Service) {
t.Helper() t.Helper()
@ -223,3 +229,17 @@ func assertEqual(t *testing.T, want, got []*pb.Service) {
t.Errorf("(-want +got):\n%s", diff) t.Errorf("(-want +got):\n%s", diff)
} }
} }
func TestAssertEqual(t *testing.T) {
svcA := &pb.Service{Kind: pb.ServiceKind_PROMETHEUS_METRICS, Endpoint: "http://host-a/metrics"}
svcB := &pb.Service{Kind: pb.ServiceKind_PROMETHEUS_METRICS, Endpoint: "http://host-b/metrics"}
svcC := &pb.Service{Kind: pb.ServiceKind_AUTHENTICATE, Endpoint: "http://host-a/"}
svcD := &pb.Service{Kind: pb.ServiceKind_AUTHORIZE, Endpoint: "http://host-a/"}
svcE := &pb.Service{Kind: pb.ServiceKind_AUTHENTICATE, Endpoint: "http://host-e/"}
svcF := &pb.Service{Kind: pb.ServiceKind_AUTHORIZE, Endpoint: "http://host-f/"}
assertEqual(t, []*pb.Service{svcA, svcB}, []*pb.Service{svcA, svcB})
assertEqual(t, []*pb.Service{svcB, svcA}, []*pb.Service{svcA, svcB})
assertEqual(t, []*pb.Service{svcC, svcD}, []*pb.Service{svcD, svcC})
assertEqual(t, []*pb.Service{svcE, svcF}, []*pb.Service{svcF, svcE})
}