Skip to content

Commit

Permalink
TestBucketGetRegions fails intermittently (#1125)
Browse files Browse the repository at this point in the history
* TestBucketGetRegions is flaky

* addressed review comments

* addressed review comments

* [nit] Adding space

Co-authored-by: Pavan Navarathna <pavan@kasten.io>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
  • Loading branch information
3 people committed Nov 10, 2021
1 parent 3dd60a5 commit 4c5f6ec
Showing 1 changed file with 17 additions and 4 deletions.
21 changes: 17 additions & 4 deletions pkg/objectstore/objectstore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -438,15 +438,28 @@ func (s *ObjectStoreProviderSuite) TestBucketGetRegions(c *C) {
c.Skip("Test only applicable to S3")
}
ctx := context.Background()
buckets, err := s.provider.ListBuckets(ctx)
origBucket, err := s.provider.GetBucket(ctx, testBucketName)
c.Assert(err, IsNil)
c.Assert(origBucket, NotNil)

// Creating an object in existing bucket to check it later when we call GetOrCreateBucket,
// to see if existing bucket was returned
orgBucketObjectName := s.suiteDirPrefix + "GetRegions"
err = origBucket.PutBytes(ctx, orgBucketObjectName, []byte("content-getRegions"), nil)
c.Assert(err, IsNil)
defer func() {
err = origBucket.Delete(ctx, orgBucketObjectName)
c.Assert(err, IsNil)
}()

b, err := GetOrCreateBucket(ctx, s.provider, testBucketName)
c.Assert(err, IsNil)
c.Assert(b, NotNil)
// Make sure no new bucket was created
newBuckets, err := s.provider.ListBuckets(ctx)

// Checking if same bucket was returned by checking if object
// that was created previously exists in newly retrieved bucket
_, _, err = b.Get(ctx, orgBucketObjectName)
c.Assert(err, IsNil)
c.Assert(newBuckets, HasLen, len(buckets))

l, err := b.ListObjects(ctx)
c.Assert(err, IsNil)
Expand Down

0 comments on commit 4c5f6ec

Please sign in to comment.