fix race

xds/internal/xdsclient/authority_test.go

@@ -126,12 +126,14 @@ func (s) TestResourceDeletionIsIgnored(t *testing.T) {
 
 	// Waiting for updates to reach the client.
 	<-watcherChA
+	a.resourcesMu.Lock()
 	if a.resources[rType][resourceNameA].cache == nil {
 		t.Fatal("Got state = nil, Want valid state for the resource.")
 	}
 	if a.resources[rType][resourceNameB].cache == nil {
 		t.Fatal("Got state = nil, Want valid state for the resource.")
 	}
+	a.resourcesMu.Unlock()
 
 	// Sending an update without resource B.
 	resources = e2e.UpdateOptions{
@@ -146,12 +148,14 @@ func (s) TestResourceDeletionIsIgnored(t *testing.T) {
 	// Waiting for updates to reach the client.
 	<-watcherChA
 	// Verifying that both resources are still in cache.
+	a.resourcesMu.Lock()
 	if a.resources[rType][resourceNameA].cache == nil {
 		t.Fatal("Got state = nil, Want valid state for the resource.")
 	}
 	if a.resources[rType][resourceNameB].cache == nil {
 		t.Fatal("Got state = nil, Want valid state for the resource.")
 	}
+	a.resourcesMu.Unlock()
 
 }
 
@@ -215,16 +219,18 @@ func (s) TestResourceDeletionIsNotIgnored(t *testing.T) {
 		t.Fatalf("Failed to update management server with resources: %v, err: %v", resources, err)
 	}
 
-	// Wait for updates to reach the client.
+	// Waiting for updates to reach the client.
 	<-watcherChA
+	a.resourcesMu.Lock()
 	if a.resources[rType][resourceNameA].cache == nil {
 		t.Fatal("Got state = nil, Want valid state for the resource.")
 	}
 	if a.resources[rType][resourceNameB].cache == nil {
 		t.Fatal("Got state = nil, Want valid state for the resource.")
 	}
+	a.resourcesMu.Unlock()
 
-	// sending an update without resource B.
+	// Sending an update without resource B.
 	resources = e2e.UpdateOptions{
 		NodeID:         nodeID,
 		Listeners:      []*v3listenerpb.Listener{e2e.DefaultClientListener(resourceNameA, "new-rds-resourceAA")},
@@ -234,14 +240,17 @@ func (s) TestResourceDeletionIsNotIgnored(t *testing.T) {
 		t.Fatalf("Failed to update management server with resources: %v, err: %v", resources, err)
 	}
 
-	// Wait for updates to reach the client.
+	// Waiting for updates to reach the client.
 	<-watcherChA
-	// Verify that both resources are still in cache. And also check that WatcherB was never called
+	// Verifying that resource A's cache is still valid, while resource B has been
+	// deleted.
+	a.resourcesMu.Lock()
 	if a.resources[rType][resourceNameA].cache == nil {
 		t.Fatal("Got state = nil, Want valid state for the resource.")
 	}
 	if a.resources[rType][resourceNameB].cache != nil {
 		t.Fatal("Got a valid state for resource, Want resource state cache to be deleted.")
 	}
+	a.resourcesMu.Unlock()
 
 }