Skip to content

Commit

Permalink
chore(storage): reenable some skipped Bucket tests (#7528)
Browse files Browse the repository at this point in the history
  • Loading branch information
noahdietz authored Mar 10, 2023
1 parent e211635 commit 88d3eda
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions storage/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ func TestIntegration_BucketCreateDelete(t *testing.T) {
}

func TestIntegration_BucketLifecycle(t *testing.T) {
ctx := skipJSONReads(skipGRPC("b/270215524"), "no reads in test")
ctx := skipJSONReads(context.Background(), "no reads in test")
multiTransportTest(ctx, t, func(t *testing.T, ctx context.Context, _ string, prefix string, client *Client) {
h := testHelper{t}

Expand Down Expand Up @@ -617,7 +617,7 @@ func TestIntegration_BucketUpdate(t *testing.T) {
}

func TestIntegration_BucketPolicyOnly(t *testing.T) {
ctx := skipJSONReads(skipGRPC("b/270215524"), "no reads in test")
ctx := skipJSONReads(context.Background(), "no reads in test")
multiTransportTest(ctx, t, func(t *testing.T, ctx context.Context, _ string, prefix string, client *Client) {
h := testHelper{t}

Expand Down Expand Up @@ -707,7 +707,7 @@ func TestIntegration_BucketPolicyOnly(t *testing.T) {
}

func TestIntegration_UniformBucketLevelAccess(t *testing.T) {
ctx := skipJSONReads(skipGRPC("b/270215524"), "no reads in test")
ctx := skipJSONReads(context.Background(), "no reads in test")
multiTransportTest(ctx, t, func(t *testing.T, ctx context.Context, _ string, prefix string, client *Client) {
h := testHelper{t}
bkt := client.Bucket(prefix + uidSpace.New())
Expand Down Expand Up @@ -790,7 +790,7 @@ func TestIntegration_UniformBucketLevelAccess(t *testing.T) {
}

func TestIntegration_PublicAccessPrevention(t *testing.T) {
ctx := skipJSONReads(skipGRPC("b/270215524"), "no reads in test")
ctx := skipJSONReads(context.Background(), "no reads in test")
multiTransportTest(ctx, t, func(t *testing.T, ctx context.Context, _ string, prefix string, client *Client) {
h := testHelper{t}

Expand Down Expand Up @@ -884,7 +884,7 @@ func TestIntegration_PublicAccessPrevention(t *testing.T) {
}

func TestIntegration_Autoclass(t *testing.T) {
ctx := skipJSONReads(skipGRPC("b/270215524"), "no reads in test")
ctx := skipJSONReads(context.Background(), "no reads in test")
multiTransportTest(ctx, t, func(t *testing.T, ctx context.Context, _ string, prefix string, client *Client) {
h := testHelper{t}

Expand Down Expand Up @@ -2157,7 +2157,7 @@ func TestIntegration_SignedURL_EmptyStringObjectName(t *testing.T) {
}

func TestIntegration_BucketACL(t *testing.T) {
ctx := skipJSONReads(skipGRPC("b/270215524"), "no reads in test")
ctx := skipJSONReads(context.Background(), "no reads in test")
multiTransportTest(ctx, t, func(t *testing.T, ctx context.Context, _ string, prefix string, client *Client) {
h := testHelper{t}

Expand Down Expand Up @@ -2719,7 +2719,7 @@ func TestIntegration_BucketIAM(t *testing.T) {
// a. The project that owns the requester-pays bucket (same as (2))
// b. Another project (the Firestore project).
func TestIntegration_RequesterPaysOwner(t *testing.T) {
multiTransportTest(skipGRPC("b/270215524"), t, func(t *testing.T, ctx context.Context, _, prefix string, client *Client) {
multiTransportTest(context.Background(), t, func(t *testing.T, ctx context.Context, _, prefix string, client *Client) {
jwt, err := testutil.JWTConfig()
if err != nil {
t.Fatalf("testutil.JWTConfig: %v", err)
Expand Down Expand Up @@ -2934,7 +2934,7 @@ func TestIntegration_RequesterPaysNonOwner(t *testing.T) {
t.Fatalf("need a second account (env var %s)", envFirestorePrivateKey)
}

multiTransportTest(skipGRPC("b/270215524"), t, func(t *testing.T, ctx context.Context, _, prefix string, client *Client) {
multiTransportTest(context.Background(), t, func(t *testing.T, ctx context.Context, _, prefix string, client *Client) {
client.SetRetry(WithPolicy(RetryAlways))

for _, test := range []struct {
Expand Down Expand Up @@ -3358,7 +3358,7 @@ func TestIntegration_CancelWrite(t *testing.T) {
}

func TestIntegration_UpdateCORS(t *testing.T) {
ctx := skipJSONReads(skipGRPC("b/270215524"), "no reads in test")
ctx := skipJSONReads(context.Background(), "no reads in test")
multiTransportTest(ctx, t, func(t *testing.T, ctx context.Context, _ string, prefix string, client *Client) {
initialSettings := []CORS{
{
Expand Down Expand Up @@ -3429,7 +3429,7 @@ func TestIntegration_UpdateCORS(t *testing.T) {
}

func TestIntegration_UpdateDefaultEventBasedHold(t *testing.T) {
ctx := skipJSONReads(skipGRPC("b/270215524"), "no reads in test")
ctx := skipJSONReads(context.Background(), "no reads in test")
multiTransportTest(ctx, t, func(t *testing.T, ctx context.Context, _ string, prefix string, client *Client) {
h := testHelper{t}

Expand Down Expand Up @@ -3523,7 +3523,7 @@ func TestIntegration_UpdateTemporaryHold(t *testing.T) {
}

func TestIntegration_UpdateRetentionExpirationTime(t *testing.T) {
ctx := skipJSONReads(skipGRPC("b/270215524"), "no reads in test")
ctx := skipJSONReads(context.Background(), "no reads in test")
multiTransportTest(ctx, t, func(t *testing.T, ctx context.Context, _ string, prefix string, client *Client) {
h := testHelper{t}

Expand Down Expand Up @@ -3607,7 +3607,7 @@ func TestIntegration_CustomTime(t *testing.T) {
}

func TestIntegration_UpdateRetentionPolicy(t *testing.T) {
ctx := skipJSONReads(skipGRPC("b/270215524"), "no reads in test")
ctx := skipJSONReads(context.Background(), "no reads in test")
multiTransportTest(ctx, t, func(t *testing.T, ctx context.Context, _ string, prefix string, client *Client) {
initial := &RetentionPolicy{RetentionPeriod: time.Minute}

Expand Down Expand Up @@ -3664,7 +3664,7 @@ func TestIntegration_UpdateRetentionPolicy(t *testing.T) {
}

func TestIntegration_DeleteObjectInBucketWithRetentionPolicy(t *testing.T) {
ctx := skipJSONReads(skipGRPC("b/270215524"), "no reads in test")
ctx := skipJSONReads(context.Background(), "no reads in test")
multiTransportTest(ctx, t, func(t *testing.T, ctx context.Context, _ string, prefix string, client *Client) {
h := testHelper{t}

Expand Down Expand Up @@ -3698,7 +3698,7 @@ func TestIntegration_DeleteObjectInBucketWithRetentionPolicy(t *testing.T) {
}

func TestIntegration_LockBucket(t *testing.T) {
ctx := skipJSONReads(skipGRPC("b/270215524"), "no reads in test")
ctx := skipJSONReads(context.Background(), "no reads in test")
multiTransportTest(ctx, t, func(t *testing.T, ctx context.Context, _ string, prefix string, client *Client) {
h := testHelper{t}

Expand Down Expand Up @@ -3742,7 +3742,7 @@ func TestIntegration_LockBucket_MetagenerationRequired(t *testing.T) {
}

func TestIntegration_KMS(t *testing.T) {
multiTransportTest(skipGRPC("b/270215524"), t, func(t *testing.T, ctx context.Context, bucket, prefix string, client *Client) {
multiTransportTest(context.Background(), t, func(t *testing.T, ctx context.Context, bucket, prefix string, client *Client) {
h := testHelper{t}

keyRingName := os.Getenv("GCLOUD_TESTS_GOLANG_KEYRING")
Expand Down Expand Up @@ -3835,7 +3835,7 @@ func TestIntegration_PredefinedACLs(t *testing.T) {
userOwner := prefixRoleACL{prefix: "user", role: RoleOwner}
authenticatedRead := entityRoleACL{entity: AllAuthenticatedUsers, role: RoleReader}

ctx := skipJSONReads(skipGRPC("b/270215524"), "no reads in test")
ctx := skipJSONReads(context.Background(), "no reads in test")
multiTransportTest(ctx, t, func(t *testing.T, ctx context.Context, _ string, prefix string, client *Client) {
h := testHelper{t}

Expand Down

0 comments on commit 88d3eda

Please sign in to comment.