Merge branch 'main' into transfertimeout_init

googleapis · Dec 4, 2024 · cb7e67b · cb7e67b
2 parents db374e1 + f82fffd
commit cb7e67b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/pubsub/iterator.go b/pubsub/iterator.go
@@ -893,7 +893,7 @@ func (it *messageIterator) pingStream() {
 	spr := &pb.StreamingPullRequest{}
 	it.eoMu.RLock()
 	if it.sendNewAckDeadline {
-		spr.StreamAckDeadlineSeconds = int32(it.ackDeadline())
+		spr.StreamAckDeadlineSeconds = int32(it.ackDeadline().Seconds())
 		it.sendNewAckDeadline = false
 	}
 	it.eoMu.RUnlock()

diff --git a/storage/dataflux/worksteal_test.go b/storage/dataflux/worksteal_test.go
@@ -22,6 +22,7 @@ import (
 )
 
 func TestWorkstealListingEmulated(t *testing.T) {
+	t.Skip("https://github.com/googleapis/google-cloud-go/issues/11205")
 	transportClientTest(context.Background(), t, func(t *testing.T, ctx context.Context, project, bucket string, client *storage.Client) {
 
 		attrs := &storage.BucketAttrs{