From ed0daef021c3c0b1eb60f32dd17004bbe1b9eb97 Mon Sep 17 00:00:00 2001 From: Maria Eduarda Duarte Date: Wed, 11 May 2022 08:41:09 -0300 Subject: [PATCH] fix linter and test errors Signed-off-by: Maria Eduarda Duarte --- pkg/objstore/prefixed_bucket_test.go | 35 +++++++++++----------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/pkg/objstore/prefixed_bucket_test.go b/pkg/objstore/prefixed_bucket_test.go index a52348a8718..f705153ae41 100644 --- a/pkg/objstore/prefixed_bucket_test.go +++ b/pkg/objstore/prefixed_bucket_test.go @@ -12,33 +12,28 @@ import ( func TestPrefixedBucket_Acceptance(t *testing.T) { prefix := "/someprefix/anotherprefix/" - bkt := NewPrefixedBucket(NewInMemBucket(), prefix) - AcceptanceTest(t, bkt) - UsesPrefixTest(t, bkt, prefix) + AcceptanceTest(t, NewPrefixedBucket(NewInMemBucket(), prefix)) + UsesPrefixTest(t, NewInMemBucket(), prefix) prefix = "someprefix/anotherprefix/" - bkt = NewPrefixedBucket(NewInMemBucket(), prefix) - AcceptanceTest(t, bkt) - UsesPrefixTest(t, bkt, prefix) + AcceptanceTest(t, NewPrefixedBucket(NewInMemBucket(), prefix)) + UsesPrefixTest(t, NewInMemBucket(), prefix) prefix = "someprefix/anotherprefix" - bkt = NewPrefixedBucket(NewInMemBucket(), prefix) - AcceptanceTest(t, bkt) - UsesPrefixTest(t, bkt, prefix) + AcceptanceTest(t, NewPrefixedBucket(NewInMemBucket(), prefix)) + UsesPrefixTest(t, NewInMemBucket(), prefix) prefix = "someprefix/" - bkt = NewPrefixedBucket(NewInMemBucket(), prefix) - AcceptanceTest(t, bkt) - UsesPrefixTest(t, bkt, prefix) + AcceptanceTest(t, NewPrefixedBucket(NewInMemBucket(), prefix)) + UsesPrefixTest(t, NewInMemBucket(), prefix) prefix = "someprefix" - bkt = NewPrefixedBucket(NewInMemBucket(), prefix) - AcceptanceTest(t, bkt) - UsesPrefixTest(t, bkt, prefix) + AcceptanceTest(t, NewPrefixedBucket(NewInMemBucket(), prefix)) + UsesPrefixTest(t, NewInMemBucket(), prefix) } func UsesPrefixTest(t *testing.T, bkt Bucket, prefix string) { - bkt.Upload(context.Background(), strings.Trim(prefix, "/")+"/file1.jpg", strings.NewReader("test-data1")) + testutil.Ok(t, bkt.Upload(context.Background(), strings.Trim(prefix, "/")+"/file1.jpg", strings.NewReader("test-data1"))) pBkt := NewPrefixedBucket(bkt, prefix) rc1, err := pBkt.Get(context.Background(), "file1.jpg") @@ -50,7 +45,7 @@ func UsesPrefixTest(t *testing.T, bkt Bucket, prefix string) { testutil.Ok(t, err) testutil.Equals(t, "test-data1", string(content)) - pBkt.Upload(context.Background(), "file2.jpg", strings.NewReader("test-data2")) + testutil.Ok(t, pBkt.Upload(context.Background(), "file2.jpg", strings.NewReader("test-data2"))) rc2, err := bkt.Get(context.Background(), strings.Trim(prefix, "/")+"/file2.jpg") testutil.Ok(t, err) @@ -60,10 +55,8 @@ func UsesPrefixTest(t *testing.T, bkt Bucket, prefix string) { testutil.Ok(t, err) testutil.Equals(t, "test-data2", string(contentUpload)) - pBkt.Delete(context.Background(), "file2.jpg") + testutil.Ok(t, pBkt.Delete(context.Background(), "file2.jpg")) _, err = bkt.Get(context.Background(), strings.Trim(prefix, "/")+"/file2.jpg") - testutil.Ok(t, err) - testutil.NotOk(t, err) testutil.Assert(t, pBkt.IsObjNotFoundErr(err), "expected not found error got %s", err) @@ -82,7 +75,7 @@ func UsesPrefixTest(t *testing.T, bkt Bucket, prefix string) { testutil.Ok(t, err) testutil.Assert(t, attrs.Size == 10, "expected size to be equal to 10") - bkt.Upload(context.Background(), strings.Trim(prefix, "/")+"/dir/file1.jpg", strings.NewReader("test-data1")) + testutil.Ok(t, bkt.Upload(context.Background(), strings.Trim(prefix, "/")+"/dir/file1.jpg", strings.NewReader("test-data1"))) seen := []string{} testutil.Ok(t, pBkt.Iter(context.Background(), "", func(fn string) error { seen = append(seen, fn)