Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: grpc/grpc-go
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9d9646bbac196e9f8779fe3b9884584ee060736a
Choose a base ref
..
head repository: grpc/grpc-go
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4fdb8468e5468c56961ad1a2d37e241f9346df64
Choose a head ref
Showing with 2 additions and 4 deletions.
  1. +2 −4 xds/internal/resolver/xds_resolver_test.go
6 changes: 2 additions & 4 deletions xds/internal/resolver/xds_resolver_test.go
View file
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ func (s) TestResolverBuilder_ClientCreationFails_NoBootstap(t *testing.T) {
// Build an xDS resolver without specifying bootstrap env vars.
builder := resolver.Get(xdsresolver.Scheme)
if builder == nil {
t.Errorf("Scheme %q is not registered", xdsresolver.Scheme)
t.Fatalf("Scheme %q is not registered", xdsresolver.Scheme)
}

target := resolver.Target{URL: *testutils.MustParseURL("xds:///target")}
@@ -137,7 +137,7 @@ func (s) TestResolverBuilder_DifferentBootstrapConfigs(t *testing.T) {

builder := resolver.Get(xdsresolver.Scheme)
if builder == nil {
t.Errorf("Scheme %q is not registered", xdsresolver.Scheme)
t.Fatalf("Scheme %q is not registered", xdsresolver.Scheme)
}

r, err := builder.Build(test.target, &testutils.ResolverClientConn{Logger: t}, test.buildOpts)
@@ -776,8 +776,6 @@ func (s) TestResolverMaxStreamDuration(t *testing.T) {
configureResourcesOnManagementServer(ctx, t, mgmtServer, nodeID, listeners, routes)

// Read the update pushed by the resolver to the ClientConn.
// TODO(easwars): verify that the SC update matches expectation. That way,
// we can get rid of the TestServiceWatchLDSUpdateMaxStreamDuration test.
cs := verifyUpdateFromResolver(ctx, t, stateCh, "")

testCases := []struct {