fix tests

googleapis · Jan 15, 2025 · b44cbd0 · b44cbd0
1 parent 748fe7f
commit b44cbd0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/bigtable/bigtable.go b/bigtable/bigtable.go
@@ -1348,6 +1348,11 @@ func (t *Table) doApplyBulk(ctx context.Context, entryErrs []*entryErr, headerMD
 		}
 	}
 
+	var topLevelErr error
+	defer func() {
+		populateTopLevelError(entryErrs, topLevelErr)
+	}()
+
 	entries := make([]*btpb.MutateRowsRequest_Entry, len(entryErrs))
 	for i, entryErr := range entryErrs {
 		entries[i] = entryErr.Entry
@@ -1364,8 +1369,7 @@ func (t *Table) doApplyBulk(ctx context.Context, entryErrs []*entryErr, headerMD
 
 	stream, err := t.c.client.MutateRows(ctx, req)
 	if err != nil {
-		_, topLevelErr := convertToGrpcStatusErr(err)
-		populateTopLevelError(entryErrs, topLevelErr)
+		_, topLevelErr = convertToGrpcStatusErr(err)
 		return err
 	}
 
@@ -1380,12 +1384,10 @@ func (t *Table) doApplyBulk(ctx context.Context, entryErrs []*entryErr, headerMD
 		}
 		if err != nil {
 			*trailerMD = stream.Trailer()
-			_, topLevelErr := convertToGrpcStatusErr(err)
-			populateTopLevelError(entryErrs, topLevelErr)
+			_, topLevelErr = convertToGrpcStatusErr(err)
 			return err
 		}
 
-		populateTopLevelError(entryErrs, nil)
 		for _, entry := range res.Entries {
 			s := entry.Status
 			if s.Code == int32(codes.OK) {

diff --git a/bigtable/retry_test.go b/bigtable/retry_test.go
@@ -354,8 +354,8 @@ func TestRetryApplyBulk_IndividualErrorsAndDeadlineExceeded(t *testing.T) {
 	if !equalErrs(wantErr, err) {
 		t.Fatalf("deadline exceeded error: got: %v, want: %v", err, wantErr)
 	}
-	if errors == nil {
-		t.Errorf("deadline exceeded errors: got: %v, want: %v", err, []error{wantErr})
+	if errors != nil {
+		t.Errorf("deadline exceeded errors: got: %v, want: nil", err)
 	}
 }