Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(storage): use context value to skip transport tests #6662

Merged
merged 3 commits into from Sep 13, 2022
+92 −89
Merged

chore(storage): use context value to skip transport tests #6662

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9a8e8d
chore(storage): use context value to skip transport tests
noahdietz Sep 13, 2022
a95929a
refactor to helper functions
noahdietz Sep 13, 2022
49ca649
Merge branch 'main' into skippable-tests
noahdietz Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
181 changes: 92 additions & 89 deletions storage/integration_test.go
View file
Open in desktop
Expand Up @@ -63,6 +63,8 @@ import (
"google.golang.org/grpc/codes"
)

type skipTransportTestKey string

const (
testPrefix = "go-integration-test"
replayFilename = "storage.replay"
Expand Down Expand Up @@ -258,6 +260,10 @@ func multiTransportTest(ctx context.Context, t *testing.T, test func(*testing.T,
t.Run(transport, func(t *testing.T) {
defer client.Close()

if reason := ctx.Value(skipTransportTestKey(transport)); reason != nil {
t.Skip("transport", fmt.Sprintf("%q", transport), "explicitly skipped:", reason)
}

bucket := bucketName
var prefix string
if transport == "grpc" {
Expand Down Expand Up @@ -470,50 +476,49 @@ func TestIntegration_BucketCreateDelete(t *testing.T) {
}

func TestIntegration_BucketLifecycle(t *testing.T) {
ctx := context.Background()
client := testConfig(ctx, t)
defer client.Close()
h := testHelper{t}
multiTransportTest(skipGRPC("b/245997450"), t, func(t *testing.T, ctx context.Context, _ string, prefix string, client *Client) {
h := testHelper{t}

wantLifecycle := Lifecycle{
Rules: []LifecycleRule{
{
Action: LifecycleAction{Type: AbortIncompleteMPUAction},
Condition: LifecycleCondition{AgeInDays: 30},
},
{
Action: LifecycleAction{Type: DeleteAction},
Condition: LifecycleCondition{AllObjects: true},
wantLifecycle := Lifecycle{
Rules: []LifecycleRule{
{
Action: LifecycleAction{Type: AbortIncompleteMPUAction},
Condition: LifecycleCondition{AgeInDays: 30},
},
{
Action: LifecycleAction{Type: DeleteAction},
Condition: LifecycleCondition{AllObjects: true},
},
},
},
}
}

bucket := client.Bucket(uidSpace.New())
bucket := client.Bucket(prefix + uidSpace.New())

// Create bucket with lifecycle rules
bucket.Create(ctx, testutil.ProjID(), &BucketAttrs{
Lifecycle: wantLifecycle,
})
defer h.mustDeleteBucket(bucket)
// Create bucket with lifecycle rules
h.mustCreate(bucket, testutil.ProjID(), &BucketAttrs{
Lifecycle: wantLifecycle,
})
defer h.mustDeleteBucket(bucket)

attrs := h.mustBucketAttrs(bucket)
if !testutil.Equal(attrs.Lifecycle, wantLifecycle) {
t.Fatalf("got %v, want %v", attrs.Lifecycle, wantLifecycle)
}
attrs := h.mustBucketAttrs(bucket)
if !testutil.Equal(attrs.Lifecycle, wantLifecycle) {
t.Fatalf("got %v, want %v", attrs.Lifecycle, wantLifecycle)
}

// Remove lifecycle rules
ua := BucketAttrsToUpdate{Lifecycle: &Lifecycle{}}
attrs = h.mustUpdateBucket(bucket, ua, attrs.MetaGeneration)
if !testutil.Equal(attrs.Lifecycle, Lifecycle{}) {
t.Fatalf("got %v, want %v", attrs.Lifecycle, Lifecycle{})
}
// Remove lifecycle rules
ua := BucketAttrsToUpdate{Lifecycle: &Lifecycle{}}
attrs = h.mustUpdateBucket(bucket, ua, attrs.MetaGeneration)
if !testutil.Equal(attrs.Lifecycle, Lifecycle{}) {
t.Fatalf("got %v, want %v", attrs.Lifecycle, Lifecycle{})
}

// Update bucket with a lifecycle rule
ua = BucketAttrsToUpdate{Lifecycle: &wantLifecycle}
attrs = h.mustUpdateBucket(bucket, ua, attrs.MetaGeneration)
if !testutil.Equal(attrs.Lifecycle, wantLifecycle) {
t.Fatalf("got %v, want %v", attrs.Lifecycle, wantLifecycle)
}
// Update bucket with a lifecycle rule
ua = BucketAttrsToUpdate{Lifecycle: &wantLifecycle}
attrs = h.mustUpdateBucket(bucket, ua, attrs.MetaGeneration)
if !testutil.Equal(attrs.Lifecycle, wantLifecycle) {
t.Fatalf("got %v, want %v", attrs.Lifecycle, wantLifecycle)
}
})
}

func TestIntegration_BucketUpdate(t *testing.T) {
Expand Down Expand Up @@ -1330,64 +1335,54 @@ func TestIntegration_CancelWriteGRPC(t *testing.T) {
}

func TestIntegration_MultiMessageWriteGRPC(t *testing.T) {
ctx := context.Background()

// Create an HTTP client to read test data and a gRPC client to test write
// with.
hc := testConfig(ctx, t)
defer hc.Close()
gc := testConfigGRPC(ctx, t)
defer gc.Close()
multiTransportTest(skipHTTP("gRPC implementation specific test"), t, func(t *testing.T, ctx context.Context, bucket string, _ string, client *Client) {
h := testHelper{t}

name := uidSpace.New()
gobj := gc.Bucket(grpcBucketName).Object(name).Retryer(WithPolicy(RetryAlways))
hobj := hc.Bucket(grpcBucketName).Object(name).Retryer(WithPolicy(RetryAlways))
defer func() {
if err := hobj.Delete(ctx); err != nil {
log.Printf("failed to delete test object: %v", err)
}
}()
name := uidSpace.New()
obj := client.Bucket(bucket).Object(name).Retryer(WithPolicy(RetryAlways))
defer h.mustDeleteObject(obj)

// Use a larger blob to test multi-message logic. This is a little over 5MB.
content := bytes.Repeat([]byte("a"), 5<<20)
// Use a larger blob to test multi-message logic. This is a little over 5MB.
content := bytes.Repeat([]byte("a"), 5<<20)

crc32c := crc32.Checksum(content, crc32cTable)
w := gobj.NewWriter(ctx)
w.ProgressFunc = func(p int64) {
t.Logf("%s: committed %d\n", t.Name(), p)
}
w.SendCRC32C = true
w.CRC32C = crc32c
got, err := w.Write(content)
if err != nil {
t.Fatalf("Writer.Write: %v", err)
}
// Flush the buffer to finish the upload.
if err := w.Close(); err != nil {
t.Fatalf("Writer.Close: %v", err)
}
crc32c := crc32.Checksum(content, crc32cTable)
w := obj.NewWriter(ctx)
w.ProgressFunc = func(p int64) {
t.Logf("%s: committed %d\n", t.Name(), p)
}
w.SendCRC32C = true
w.CRC32C = crc32c
got, err := w.Write(content)
if err != nil {
t.Fatalf("Writer.Write: %v", err)
}
// Flush the buffer to finish the upload.
if err := w.Close(); err != nil {
t.Fatalf("Writer.Close: %v", err)
}

want := len(content)
if got != want {
t.Errorf("While writing got: %d want %d", got, want)
}
want := len(content)
if got != want {
t.Errorf("While writing got: %d want %d", got, want)
}

// Use HTTP client to read back the Object for verification.
hr, err := hc.Bucket(grpcBucketName).Object(name).NewReader(ctx)
if err != nil {
t.Fatal(err)
}
defer hr.Close()
// Read back the Object for verification.
reader, err := client.Bucket(bucket).Object(name).NewReader(ctx)
if err != nil {
t.Fatal(err)
}
defer reader.Close()

buf := make([]byte, want+4<<10)
b := bytes.NewBuffer(buf)
gotr, err := io.Copy(b, hr)
if err != nil {
t.Fatal(err)
}
if gotr != int64(want) {
t.Errorf("While reading got: %d want %d", gotr, want)
}
buf := make([]byte, want+4<<10)
b := bytes.NewBuffer(buf)
gotr, err := io.Copy(b, reader)
if err != nil {
t.Fatal(err)
}
if gotr != int64(want) {
t.Errorf("While reading got: %d want %d", gotr, want)
}
})
}

func TestIntegration_MultiChunkWriteGRPC(t *testing.T) {
Expand Down Expand Up @@ -5048,3 +5043,11 @@ func retry(ctx context.Context, call func() error, check func() error) error {
time.Sleep(200 * time.Millisecond)
}
}

func skipGRPC(reason string) context.Context {
return context.WithValue(context.Background(), skipTransportTestKey("grpc"), reason)
}

func skipHTTP(reason string) context.Context {
return context.WithValue(context.Background(), skipTransportTestKey("http"), reason)
}