Review comments #1

Author: easwars

xds/internal/client/cds_test.go

@@ -370,7 +370,7 @@ func TestCDSCaching(t *testing.T) {
 	}
 	errCh := testutils.NewChannel()
 	go testCDSCaching(t, ops, errCh)
-	waitForNonNilErr(t, errCh)
+	waitForNilErr(t, errCh)
 }
 
 // TestCDSWatchExpiryTimer tests the case where the client does not receive an
@@ -407,7 +407,7 @@ func TestCDSWatchExpiryTimer(t *testing.T) {
 	if _, err := fakeServer.XDSRequestChan.Receive(); err != nil {
 		t.Fatalf("Timeout expired when expecting an CDS request")
 	}
-	waitForNonNilErr(t, callbackCh)
+	waitForNilErr(t, callbackCh)
 }
 
 var (

xds/internal/client/client_test.go

@@ -150,7 +150,7 @@ func TestWatchService(t *testing.T) {
 		t.Fatalf("Timeout expired when expecting an RDS request")
 	}
 	fakeServer.XDSResponseChan <- &fakeserver.Response{Resp: goodRDSResponse1}
-	waitForNonNilErr(t, callbackCh)
+	waitForNilErr(t, callbackCh)
 }
 
 // TestWatchServiceWithNoResponseFromServer tests the case where the
@@ -196,7 +196,7 @@ func TestWatchServiceWithNoResponseFromServer(t *testing.T) {
 	if _, err := fakeServer.XDSRequestChan.Receive(); err != nil {
 		t.Fatalf("Timeout expired when expecting an LDS request")
 	}
-	waitForNonNilErr(t, callbackCh)
+	waitForNilErr(t, callbackCh)
 }
 
 // TestWatchServiceEmptyRDS tests the case where the underlying
@@ -247,7 +247,7 @@ func TestWatchServiceEmptyRDS(t *testing.T) {
 		t.Fatalf("Timeout expired when expecting an RDS request")
 	}
 	fakeServer.XDSResponseChan <- &fakeserver.Response{Resp: noVirtualHostsInRDSResponse}
-	waitForNonNilErr(t, callbackCh)
+	waitForNilErr(t, callbackCh)
 }
 
 // TestWatchServiceWithClientClose tests the case where xDS responses are

xds/internal/client/eds_test.go

@@ -284,5 +284,5 @@ func TestEDSWatchExpiryTimer(t *testing.T) {
 	if _, err := fakeServer.XDSRequestChan.Receive(); err != nil {
 		t.Fatalf("Timeout expired when expecting an CDS request")
 	}
-	waitForNonNilErr(t, callbackCh)
+	waitForNilErr(t, callbackCh)
 }

xds/internal/client/lds_test.go

@@ -237,5 +237,5 @@ func TestLDSWatchExpiryTimer(t *testing.T) {
 	if _, err := fakeServer.XDSRequestChan.Receive(); err != nil {
 		t.Fatalf("Timeout expired when expecting an LDS request")
 	}
-	waitForNonNilErr(t, callbackCh)
+	waitForNilErr(t, callbackCh)
 }

xds/internal/client/rds_test.go

@@ -181,7 +181,7 @@ func doLDS(t *testing.T, v2c *v2Client, fakeServer *fakeserver.Server) {
 	}
 
 	fakeServer.XDSResponseChan <- &fakeserver.Response{Resp: goodLDSResponse1}
-	waitForNonNilErr(t, cbCh)
+	waitForNilErr(t, cbCh)
 
 	// Read the LDS ack, to clear RequestChan for following tests.
 	if _, err := fakeServer.XDSRequestChan.Receive(); err != nil {
@@ -420,7 +420,7 @@ func TestRDSCaching(t *testing.T) {
 	}
 	errCh := testutils.NewChannel()
 	go testRDSCaching(t, ops, errCh)
-	waitForNonNilErr(t, errCh)
+	waitForNilErr(t, errCh)
 }
 
 // TestRDSWatchExpiryTimer tests the case where the client does not receive an
@@ -458,7 +458,7 @@ func TestRDSWatchExpiryTimer(t *testing.T) {
 	if _, err := fakeServer.XDSRequestChan.Receive(); err != nil {
 		t.Fatalf("Timeout expired when expecting an RDS request")
 	}
-	waitForNonNilErr(t, callbackCh)
+	waitForNilErr(t, callbackCh)
 }
 
 func TestHostFromTarget(t *testing.T) {

xds/internal/client/testutil_test.go

@@ -152,9 +152,9 @@ func startServerAndGetCC(t *testing.T) (*fakeserver.Server, *grpc.ClientConn, fu
 	}
 }
 
-// waitForNonNilErr waits for a non-nil error value to be received on the
+// waitForNilErr waits for a nil error value to be received on the
 // provided channel.
-func waitForNonNilErr(t *testing.T, ch *testutils.Channel) {
+func waitForNilErr(t *testing.T, ch *testutils.Channel) {
 	t.Helper()
 
 	val, err := ch.Receive()