Skip to content

Commit

Permalink
test(storage): fix gRPC integration test flakes (#5414)
Browse files Browse the repository at this point in the history
These tests no longer include upload retries because of the new
idempotency defaults. Changed them to retry regardless of
idempotency.

Fixes #5372
  • Loading branch information
tritone committed Feb 1, 2022
1 parent bf04c85 commit 9f79ac4
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions storage/integration_test.go
Expand Up @@ -1067,7 +1067,7 @@ func TestIntegration_SimpleWriteGRPC(t *testing.T) {
defer gc.Close()

name := uidSpace.New()
gobj := gc.Bucket(grpcBucketName).Object(name)
gobj := gc.Bucket(grpcBucketName).Object(name).Retryer(WithPolicy(RetryAlways))
defer func() {
if err := gobj.Delete(ctx); err != nil {
log.Printf("failed to delete test object: %v", err)
Expand All @@ -1084,11 +1084,11 @@ func TestIntegration_SimpleWriteGRPC(t *testing.T) {
w.CRC32C = crc32c
got, err := w.Write(content)
if err != nil {
t.Fatal(err)
t.Fatalf("Writer.Write: %v", err)
}
// Flush the buffer to finish the upload.
if err := w.Close(); err != nil {
t.Fatal(err)
t.Fatalf("Writer.Close: %v", err)
}

want := len(content)
Expand Down Expand Up @@ -1124,7 +1124,7 @@ func TestIntegration_CancelWriteGRPC(t *testing.T) {
defer gc.Close()

name := uidSpace.New()
gobj := gc.Bucket(grpcBucketName).Object(name)
gobj := gc.Bucket(grpcBucketName).Object(name).Retryer(WithPolicy(RetryAlways))
defer func() {
// As insurance attempt to delete the object, ignore the error if it
// doesn't exist, because it wasn't made.
Expand All @@ -1140,7 +1140,7 @@ func TestIntegration_CancelWriteGRPC(t *testing.T) {
content := make([]byte, w.ChunkSize)
_, err := w.Write(content)
if err != nil {
t.Fatal(err)
t.Fatalf("Writer.Write: %v", err)
}
// Cancel the Writer context before flushing.
// TODO: Add a test that writes at least a chunk before canceling part way through.
Expand Down Expand Up @@ -1174,7 +1174,7 @@ func TestIntegration_MultiMessageWriteGRPC(t *testing.T) {
defer gc.Close()

name := uidSpace.New()
gobj := gc.Bucket(grpcBucketName).Object(name)
gobj := gc.Bucket(grpcBucketName).Object(name).Retryer(WithPolicy(RetryAlways))
defer func() {
if err := gobj.Delete(ctx); err != nil {
log.Printf("failed to delete test object: %v", err)
Expand All @@ -1193,11 +1193,11 @@ func TestIntegration_MultiMessageWriteGRPC(t *testing.T) {
w.CRC32C = crc32c
got, err := w.Write(content)
if err != nil {
t.Fatal(err)
t.Fatalf("Writer.Write: %v", err)
}
// Flush the buffer to finish the upload.
if err := w.Close(); err != nil {
t.Fatal(err)
t.Fatalf("Writer.Close: %v", err)
}

want := len(content)
Expand Down Expand Up @@ -1234,7 +1234,7 @@ func TestIntegration_MultiChunkWriteGRPC(t *testing.T) {
defer gc.Close()

name := uidSpace.New()
gobj := gc.Bucket(grpcBucketName).Object(name)
gobj := gc.Bucket(grpcBucketName).Object(name).Retryer(WithPolicy(RetryAlways))
defer func() {
if err := gobj.Delete(ctx); err != nil {
log.Printf("failed to delete test object: %v", err)
Expand All @@ -1255,11 +1255,11 @@ func TestIntegration_MultiChunkWriteGRPC(t *testing.T) {
}
got, err := w.Write(content)
if err != nil {
t.Fatal(err)
t.Fatalf("Writer.Write: %v", err)
}
// Flush the buffer to finish the upload.
if err := w.Close(); err != nil {
t.Fatal(err)
t.Fatalf("Writer.Close: %v", err)
}

want := len(content)
Expand Down

0 comments on commit 9f79ac4

Please sign in to comment.