fix(kms/test): Fix flake (#2723)

There was some flakiness observed in this test, where keyCount was reported to be 21. To prevent any potential conflicts, we are making the sub-tests not run in parallel.
pull/2313/head
Michael Li 3 years ago committed by GitHub
parent 8bd883a37d
commit 44fd85c751
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -202,7 +202,6 @@ func Test_RotateKeys(t *testing.T) {
rw := db.New(conn)
t.Run("success", func(t *testing.T) {
t.Parallel()
// arrange
// we're not trying to test the ListKeys function, although we need to use it to validate the rotation
keys, err := kmsCache.ListKeys(testCtx, "global")
@ -222,11 +221,10 @@ func Test_RotateKeys(t *testing.T) {
keyCount += len(key.Versions)
}
require.Equal(t, keyCount, 14)
require.Equal(t, 14, keyCount)
})
t.Run("reader provided, missing writer", func(t *testing.T) {
t.Parallel()
// arrange
WithReader := func(reader db.Reader) Option {
return func(o *options) {
@ -242,7 +240,6 @@ func Test_RotateKeys(t *testing.T) {
})
t.Run("writer provided, missing reader", func(t *testing.T) {
t.Parallel()
// arrange
WithWriter := func(writer db.Writer) Option {
return func(o *options) {
@ -258,7 +255,6 @@ func Test_RotateKeys(t *testing.T) {
})
t.Run("invalid reader", func(t *testing.T) {
t.Parallel()
// act
err := kmsCache.RotateKeys(testCtx, "global", WithReaderWriter(&invalidReader{}, rw))
@ -267,7 +263,6 @@ func Test_RotateKeys(t *testing.T) {
})
t.Run("invalid writer", func(t *testing.T) {
t.Parallel()
// act
err := kmsCache.RotateKeys(testCtx, "global", WithReaderWriter(rw, &invalidWriter{}))
@ -276,8 +271,7 @@ func Test_RotateKeys(t *testing.T) {
})
t.Run("both reader and writer succeed", func(t *testing.T) {
t.Parallel()
err = kmsCache.RotateKeys(testCtx, "global", WithReaderWriter(rw, rw))
err := kmsCache.RotateKeys(testCtx, "global", WithReaderWriter(rw, rw))
require.NoError(t, err)
})

Loading…
Cancel
Save