Skip to content
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

Jump to bottom

prototest: fix early return condition in AssertElementsMatch #17416

Merged
merged 9 commits into from
May 22, 2023
Merged

prototest: fix early return condition in AssertElementsMatch #17416

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ae61102
prototest: fix early return condition in AssertElementsMatch
rboyer May 19, 2023
53b4dac
add easy early abort for mismatched lengths
rboyer May 19, 2023
f81a7fb
fix agent/grpc-external/services/resource/list_test.go TestList_Many
rboyer May 19, 2023
1502a50
put this in the correct place
rboyer May 19, 2023
8c5de23
switch this to the style of other resource packages
rboyer May 19, 2023
2dd208e
fix this test
rboyer May 19, 2023
a660017
Update write in test to use resource service instead of directly to t…
analogue May 19, 2023
446851f
remove this now
rboyer May 19, 2023
6b3215b
Merge branch 'main' into fix-prototest-bug
rboyer May 22, 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
Prev Previous commit
Next Next commit
fix this test
  • Loading branch information
@rboyer
rboyer committed May 19, 2023
commit 2dd208e0b517cb2714e49969d4657ae4a6b7e50c
8 changes: 5 additions & 3 deletions agent/grpc-external/services/peerstream/stream_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ func TestStreamResources_Server_StreamTracker(t *testing.T) {
it := incrementalTime{
base: time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC),
}
waitUntil := it.FutureNow(6)
waitUntil := it.FutureNow(7)

srv, store := newTestServer(t, nil)
srv.Tracker.setClock(it.Now)
Expand Down Expand Up @@ -1442,7 +1442,9 @@ func makeClient(t *testing.T, srv *testServer, peerID string) *MockClient {
// Note that server address may not come as an initial message
for _, resourceURL := range []string{
pbpeerstream.TypeURLExportedService,
pbpeerstream.TypeURLExportedServiceList,
pbpeerstream.TypeURLPeeringTrustBundle,
// only dialers request, which is why this is absent below
pbpeerstream.TypeURLPeeringServerAddresses,
} {
init := &pbpeerstream.ReplicationMessage{
Expand Down Expand Up @@ -1471,7 +1473,7 @@ func makeClient(t *testing.T, srv *testServer, peerID string) *MockClient {
{
Payload: &pbpeerstream.ReplicationMessage_Request_{
Request: &pbpeerstream.ReplicationMessage_Request{
ResourceURL: pbpeerstream.TypeURLPeeringTrustBundle,
ResourceURL: pbpeerstream.TypeURLExportedServiceList,
// The PeerID field is only set for the messages coming FROM
// the establishing side and are going to be empty from the
// other side.
Expand All @@ -1482,7 +1484,7 @@ func makeClient(t *testing.T, srv *testServer, peerID string) *MockClient {
{
Payload: &pbpeerstream.ReplicationMessage_Request_{
Request: &pbpeerstream.ReplicationMessage_Request{
ResourceURL: pbpeerstream.TypeURLPeeringServerAddresses,
ResourceURL: pbpeerstream.TypeURLPeeringTrustBundle,
// The PeerID field is only set for the messages coming FROM
// the establishing side and are going to be empty from the
// other side.
Expand Down