From 60671ce23497a2735b8f4fe8b5262cc63f5b5fe3 Mon Sep 17 00:00:00 2001 From: Eric Meisel Date: Mon, 18 Apr 2022 10:30:29 -0500 Subject: [PATCH] Fix tags regex, update test sleeps (#307) * Fix tags regex, update test sleeps * Update test sleeps --- src/fun/scala/kinesis/mock/AwsFunctionalTests.scala | 4 ++-- .../scala/kinesis/mock/DeregisterStreamConsumerTests.scala | 4 ++-- src/fun/scala/kinesis/mock/ListShardsTests.scala | 2 +- src/fun/scala/kinesis/mock/MergeShardsTests.scala | 4 ++-- .../scala/kinesis/mock/RegisterStreamConsumerTests.scala | 2 +- src/fun/scala/kinesis/mock/SplitShardTests.scala | 2 +- src/fun/scala/kinesis/mock/StartStreamEncryptionTests.scala | 2 +- src/fun/scala/kinesis/mock/StopStreamEncryptionTests.scala | 4 ++-- src/fun/scala/kinesis/mock/UpdateShardCountTests.scala | 2 +- .../scala/kinesis/mock/api/AddTagsToStreamRequest.scala | 2 +- .../scala/kinesis/mock/validations/CommonValidations.scala | 2 +- src/test/scala/kinesis/mock/cache/CreateStreamTests.scala | 2 +- .../mock/cache/DecreaseStreamRetentionPeriodTests.scala | 2 +- src/test/scala/kinesis/mock/cache/DeleteStreamTests.scala | 4 ++-- .../kinesis/mock/cache/DeregisterStreamConsumerTests.scala | 6 +++--- .../kinesis/mock/cache/DescribeStreamConsumerTests.scala | 2 +- src/test/scala/kinesis/mock/cache/GetRecordsTests.scala | 2 +- .../scala/kinesis/mock/cache/GetShardIteratorTests.scala | 2 +- .../mock/cache/IncreaseStreamRetentionPeriodTests.scala | 2 +- .../scala/kinesis/mock/cache/ListStreamConsumersTests.scala | 2 +- src/test/scala/kinesis/mock/cache/MergeShardsTests.scala | 2 +- src/test/scala/kinesis/mock/cache/PersistenceTests.scala | 2 +- src/test/scala/kinesis/mock/cache/PutRecordTests.scala | 2 +- src/test/scala/kinesis/mock/cache/PutRecordsTests.scala | 2 +- .../kinesis/mock/cache/RegisterStreamConsumerTests.scala | 4 ++-- src/test/scala/kinesis/mock/cache/SplitShardTests.scala | 2 +- .../kinesis/mock/cache/StartStreamEncryptionTests.scala | 4 ++-- .../kinesis/mock/cache/StopStreamEncryptionTests.scala | 6 +++--- .../scala/kinesis/mock/cache/UpdateShardCountTests.scala | 4 ++-- src/test/scala/kinesis/mock/instances/arbitrary.scala | 4 ++-- 30 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/fun/scala/kinesis/mock/AwsFunctionalTests.scala b/src/fun/scala/kinesis/mock/AwsFunctionalTests.scala index 57f729c4..48455514 100644 --- a/src/fun/scala/kinesis/mock/AwsFunctionalTests.scala +++ b/src/fun/scala/kinesis/mock/AwsFunctionalTests.scala @@ -132,7 +132,7 @@ trait AwsFunctionalTests extends CatsEffectSuite with CatsEffectFunFixtures { .toIO _ <- resources.logger.debug(s"Created stream ${resources.streamName}") _ <- IO.sleep( - resources.cacheConfig.createStreamDuration.plus(200.millis) + resources.cacheConfig.createStreamDuration.plus(400.millis) ) _ <- resources.logger.debug( s"Describing stream summary for ${resources.streamName}" @@ -163,7 +163,7 @@ trait AwsFunctionalTests extends CatsEffectSuite with CatsEffectFunFixtures { .toIO _ <- resources.logger.debug(s"Deleted stream ${resources.streamName}") _ <- IO.sleep( - resources.cacheConfig.deleteStreamDuration.plus(200.millis) + resources.cacheConfig.deleteStreamDuration.plus(400.millis) ) _ <- resources.logger.debug( s"Describing stream summary for ${resources.streamName}" diff --git a/src/fun/scala/kinesis/mock/DeregisterStreamConsumerTests.scala b/src/fun/scala/kinesis/mock/DeregisterStreamConsumerTests.scala index 1e982b9e..94d13582 100644 --- a/src/fun/scala/kinesis/mock/DeregisterStreamConsumerTests.scala +++ b/src/fun/scala/kinesis/mock/DeregisterStreamConsumerTests.scala @@ -26,7 +26,7 @@ class DeregisterStreamConsumerTests extends AwsFunctionalTests { ) .toIO _ <- IO.sleep( - resources.cacheConfig.registerStreamConsumerDuration.plus(200.millis) + resources.cacheConfig.registerStreamConsumerDuration.plus(400.millis) ) _ <- resources.kinesisClient .deregisterStreamConsumer( @@ -39,7 +39,7 @@ class DeregisterStreamConsumerTests extends AwsFunctionalTests { .toIO check1 <- describeStreamConsumer(resources, consumerName, streamArn) _ <- IO.sleep( - resources.cacheConfig.deregisterStreamConsumerDuration.plus(200.millis) + resources.cacheConfig.deregisterStreamConsumerDuration.plus(400.millis) ) check2 <- describeStreamConsumer( resources, diff --git a/src/fun/scala/kinesis/mock/ListShardsTests.scala b/src/fun/scala/kinesis/mock/ListShardsTests.scala index 32cbc901..d1752139 100644 --- a/src/fun/scala/kinesis/mock/ListShardsTests.scala +++ b/src/fun/scala/kinesis/mock/ListShardsTests.scala @@ -23,7 +23,7 @@ class ListShardsTests extends AwsFunctionalTests { ) .toIO _ <- IO.sleep( - resources.cacheConfig.updateShardCountDuration.plus(200.millis) + resources.cacheConfig.updateShardCountDuration.plus(400.millis) ) res <- resources.kinesisClient .listShards( diff --git a/src/fun/scala/kinesis/mock/MergeShardsTests.scala b/src/fun/scala/kinesis/mock/MergeShardsTests.scala index d500ac12..56c696f2 100644 --- a/src/fun/scala/kinesis/mock/MergeShardsTests.scala +++ b/src/fun/scala/kinesis/mock/MergeShardsTests.scala @@ -23,7 +23,7 @@ class MergeShardsTests extends AwsFunctionalTests { ) .toIO _ <- IO.sleep( - resources.cacheConfig.updateShardCountDuration.plus(200.millis) + resources.cacheConfig.updateShardCountDuration.plus(400.millis) ) openShards <- resources.kinesisClient .listShards( @@ -49,7 +49,7 @@ class MergeShardsTests extends AwsFunctionalTests { .build() ) .toIO - _ <- IO.sleep(resources.cacheConfig.mergeShardsDuration.plus(200.millis)) + _ <- IO.sleep(resources.cacheConfig.mergeShardsDuration.plus(400.millis)) openShards2 <- resources.kinesisClient .listShards( ListShardsRequest diff --git a/src/fun/scala/kinesis/mock/RegisterStreamConsumerTests.scala b/src/fun/scala/kinesis/mock/RegisterStreamConsumerTests.scala index 7764fba8..41afc21d 100644 --- a/src/fun/scala/kinesis/mock/RegisterStreamConsumerTests.scala +++ b/src/fun/scala/kinesis/mock/RegisterStreamConsumerTests.scala @@ -27,7 +27,7 @@ class RegisterStreamConsumerTests extends AwsFunctionalTests { .toIO check1 <- describeStreamConsumer(resources, consumerName, streamArn) _ <- IO.sleep( - resources.cacheConfig.registerStreamConsumerDuration.plus(200.millis) + resources.cacheConfig.registerStreamConsumerDuration.plus(400.millis) ) check2 <- describeStreamConsumer( resources, diff --git a/src/fun/scala/kinesis/mock/SplitShardTests.scala b/src/fun/scala/kinesis/mock/SplitShardTests.scala index 1b62ffa8..66a66ee1 100644 --- a/src/fun/scala/kinesis/mock/SplitShardTests.scala +++ b/src/fun/scala/kinesis/mock/SplitShardTests.scala @@ -34,7 +34,7 @@ class SplitShardTests extends AwsFunctionalTests { .build() ) .toIO - _ <- IO.sleep(resources.cacheConfig.splitShardDuration.plus(200.millis)) + _ <- IO.sleep(resources.cacheConfig.splitShardDuration.plus(400.millis)) openShards <- resources.kinesisClient .listShards( ListShardsRequest diff --git a/src/fun/scala/kinesis/mock/StartStreamEncryptionTests.scala b/src/fun/scala/kinesis/mock/StartStreamEncryptionTests.scala index 121857b0..b2fbbe13 100644 --- a/src/fun/scala/kinesis/mock/StartStreamEncryptionTests.scala +++ b/src/fun/scala/kinesis/mock/StartStreamEncryptionTests.scala @@ -25,7 +25,7 @@ class StartStreamEncryptionTests extends AwsFunctionalTests { ) .toIO _ <- IO.sleep( - resources.cacheConfig.startStreamEncryptionDuration.plus(200.millis) + resources.cacheConfig.startStreamEncryptionDuration.plus(400.millis) ) res <- describeStreamSummary(resources) } yield assert( diff --git a/src/fun/scala/kinesis/mock/StopStreamEncryptionTests.scala b/src/fun/scala/kinesis/mock/StopStreamEncryptionTests.scala index 1a89883b..5f6933b4 100644 --- a/src/fun/scala/kinesis/mock/StopStreamEncryptionTests.scala +++ b/src/fun/scala/kinesis/mock/StopStreamEncryptionTests.scala @@ -25,7 +25,7 @@ class StopStreamEncryptionTests extends AwsFunctionalTests { ) .toIO _ <- IO.sleep( - resources.cacheConfig.startStreamEncryptionDuration.plus(200.millis) + resources.cacheConfig.startStreamEncryptionDuration.plus(400.millis) ) _ <- resources.kinesisClient .stopStreamEncryption( @@ -38,7 +38,7 @@ class StopStreamEncryptionTests extends AwsFunctionalTests { ) .toIO _ <- IO.sleep( - resources.cacheConfig.stopStreamEncryptionDuration.plus(200.millis) + resources.cacheConfig.stopStreamEncryptionDuration.plus(400.millis) ) res <- describeStreamSummary(resources) } yield assert( diff --git a/src/fun/scala/kinesis/mock/UpdateShardCountTests.scala b/src/fun/scala/kinesis/mock/UpdateShardCountTests.scala index ffc91108..319c212e 100644 --- a/src/fun/scala/kinesis/mock/UpdateShardCountTests.scala +++ b/src/fun/scala/kinesis/mock/UpdateShardCountTests.scala @@ -23,7 +23,7 @@ class UpdateShardCountTests extends AwsFunctionalTests { ) .toIO _ <- IO.sleep( - resources.cacheConfig.updateShardCountDuration.plus(200.millis) + resources.cacheConfig.updateShardCountDuration.plus(400.millis) ) openShards <- resources.kinesisClient .listShards( diff --git a/src/main/scala/kinesis/mock/api/AddTagsToStreamRequest.scala b/src/main/scala/kinesis/mock/api/AddTagsToStreamRequest.scala index 01303408..f36681e8 100644 --- a/src/main/scala/kinesis/mock/api/AddTagsToStreamRequest.scala +++ b/src/main/scala/kinesis/mock/api/AddTagsToStreamRequest.scala @@ -39,7 +39,7 @@ final case class AddTagsToStreamRequest( else Right(()) }, { val invalidValues = tags.tags.values.filterNot(x => - x.matches("^([\\p{L}\\p{Z}\\p{N}_./=+\\-%@]*)$") + x.matches("^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$") ) if (invalidValues.nonEmpty) InvalidArgumentException( diff --git a/src/main/scala/kinesis/mock/validations/CommonValidations.scala b/src/main/scala/kinesis/mock/validations/CommonValidations.scala index c8b905e3..500576ad 100644 --- a/src/main/scala/kinesis/mock/validations/CommonValidations.scala +++ b/src/main/scala/kinesis/mock/validations/CommonValidations.scala @@ -141,7 +141,7 @@ object CommonValidations { else Right(()) }, { val invalidKeyCharacters = - keys.filterNot(x => x.matches("^([\\p{L}\\p{Z}\\p{N}_./=+\\-%@]*)$")) + keys.filterNot(x => x.matches("^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$")) if (invalidKeyCharacters.nonEmpty) InvalidArgumentException( s"Keys contain invalid characters. Invalid keys: ${invalidKeyCharacters.mkString(", ")}" diff --git a/src/test/scala/kinesis/mock/cache/CreateStreamTests.scala b/src/test/scala/kinesis/mock/cache/CreateStreamTests.scala index 1cada6ca..c8c67496 100644 --- a/src/test/scala/kinesis/mock/cache/CreateStreamTests.scala +++ b/src/test/scala/kinesis/mock/cache/CreateStreamTests.scala @@ -44,7 +44,7 @@ class CreateStreamTests false, Some(awsRegion) ) - _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis)) + _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis)) checkStream2 <- cache.describeStreamSummary( describeStreamSummaryReq, context, diff --git a/src/test/scala/kinesis/mock/cache/DecreaseStreamRetentionPeriodTests.scala b/src/test/scala/kinesis/mock/cache/DecreaseStreamRetentionPeriodTests.scala index f59af603..b9284cec 100644 --- a/src/test/scala/kinesis/mock/cache/DecreaseStreamRetentionPeriodTests.scala +++ b/src/test/scala/kinesis/mock/cache/DecreaseStreamRetentionPeriodTests.scala @@ -37,7 +37,7 @@ class DecreaseStreamRetentionPeriodTests Some(awsRegion) ) .rethrow - _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis)) + _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis)) _ <- cache .increaseStreamRetention( IncreaseStreamRetentionPeriodRequest(48, streamName), diff --git a/src/test/scala/kinesis/mock/cache/DeleteStreamTests.scala b/src/test/scala/kinesis/mock/cache/DeleteStreamTests.scala index 81b9c009..bb9193a4 100644 --- a/src/test/scala/kinesis/mock/cache/DeleteStreamTests.scala +++ b/src/test/scala/kinesis/mock/cache/DeleteStreamTests.scala @@ -37,7 +37,7 @@ class DeleteStreamTests Some(awsRegion) ) .rethrow - _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis)) + _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis)) res <- cache .deleteStream( DeleteStreamRequest(streamName, None), @@ -53,7 +53,7 @@ class DeleteStreamTests false, Some(awsRegion) ) - _ <- IO.sleep(cacheConfig.deleteStreamDuration.plus(200.millis)) + _ <- IO.sleep(cacheConfig.deleteStreamDuration.plus(400.millis)) checkStream2 <- cache.describeStreamSummary( describeStreamSummaryReq, context, diff --git a/src/test/scala/kinesis/mock/cache/DeregisterStreamConsumerTests.scala b/src/test/scala/kinesis/mock/cache/DeregisterStreamConsumerTests.scala index e92e6b46..43347e6c 100644 --- a/src/test/scala/kinesis/mock/cache/DeregisterStreamConsumerTests.scala +++ b/src/test/scala/kinesis/mock/cache/DeregisterStreamConsumerTests.scala @@ -39,7 +39,7 @@ class DeregisterStreamConsumerTests Some(awsRegion) ) .rethrow - _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis)) + _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis)) _ <- cache .registerStreamConsumer( RegisterStreamConsumerRequest(consumerName, streamArn), @@ -48,7 +48,7 @@ class DeregisterStreamConsumerTests ) .rethrow _ <- IO.sleep( - cacheConfig.registerStreamConsumerDuration.plus(200.millis) + cacheConfig.registerStreamConsumerDuration.plus(400.millis) ) _ <- cache .deregisterStreamConsumer( @@ -74,7 +74,7 @@ class DeregisterStreamConsumerTests ) .rethrow _ <- IO.sleep( - cacheConfig.deregisterStreamConsumerDuration.plus(200.millis) + cacheConfig.deregisterStreamConsumerDuration.plus(400.millis) ) checkStream2 <- cache.describeStreamConsumer( describeStreamConsumerReq, diff --git a/src/test/scala/kinesis/mock/cache/DescribeStreamConsumerTests.scala b/src/test/scala/kinesis/mock/cache/DescribeStreamConsumerTests.scala index 38d09db5..49cae802 100644 --- a/src/test/scala/kinesis/mock/cache/DescribeStreamConsumerTests.scala +++ b/src/test/scala/kinesis/mock/cache/DescribeStreamConsumerTests.scala @@ -39,7 +39,7 @@ class DescribeStreamConsumerTests Some(awsRegion) ) .rethrow - _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis)) + _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis)) registerRes <- cache .registerStreamConsumer( RegisterStreamConsumerRequest( diff --git a/src/test/scala/kinesis/mock/cache/GetRecordsTests.scala b/src/test/scala/kinesis/mock/cache/GetRecordsTests.scala index 0add3c45..72a70d2a 100644 --- a/src/test/scala/kinesis/mock/cache/GetRecordsTests.scala +++ b/src/test/scala/kinesis/mock/cache/GetRecordsTests.scala @@ -38,7 +38,7 @@ class GetRecordsTests Some(awsRegion) ) .rethrow - _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis)) + _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis)) recordRequests <- IO( putRecordRequestArb.arbitrary .take(5) diff --git a/src/test/scala/kinesis/mock/cache/GetShardIteratorTests.scala b/src/test/scala/kinesis/mock/cache/GetShardIteratorTests.scala index 33300e5d..a9fee9ba 100644 --- a/src/test/scala/kinesis/mock/cache/GetShardIteratorTests.scala +++ b/src/test/scala/kinesis/mock/cache/GetShardIteratorTests.scala @@ -37,7 +37,7 @@ class GetShardIteratorTests Some(awsRegion) ) .rethrow - _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis)) + _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis)) shard <- cache .listShards( ListShardsRequest(None, None, None, None, None, Some(streamName)), diff --git a/src/test/scala/kinesis/mock/cache/IncreaseStreamRetentionPeriodTests.scala b/src/test/scala/kinesis/mock/cache/IncreaseStreamRetentionPeriodTests.scala index 00fef5e3..e721b1fe 100644 --- a/src/test/scala/kinesis/mock/cache/IncreaseStreamRetentionPeriodTests.scala +++ b/src/test/scala/kinesis/mock/cache/IncreaseStreamRetentionPeriodTests.scala @@ -37,7 +37,7 @@ class IncreaseStreamRetentionPeriodTests Some(awsRegion) ) .rethrow - _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis)) + _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis)) _ <- cache .increaseStreamRetention( IncreaseStreamRetentionPeriodRequest(48, streamName), diff --git a/src/test/scala/kinesis/mock/cache/ListStreamConsumersTests.scala b/src/test/scala/kinesis/mock/cache/ListStreamConsumersTests.scala index 7b10a05b..e2ad87fd 100644 --- a/src/test/scala/kinesis/mock/cache/ListStreamConsumersTests.scala +++ b/src/test/scala/kinesis/mock/cache/ListStreamConsumersTests.scala @@ -38,7 +38,7 @@ class ListStreamConsumersTests Some(awsRegion) ) .rethrow - _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis)) + _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis)) streamArn <- cache .describeStreamSummary( DescribeStreamSummaryRequest(streamName), diff --git a/src/test/scala/kinesis/mock/cache/MergeShardsTests.scala b/src/test/scala/kinesis/mock/cache/MergeShardsTests.scala index 0c545cba..3f3272a5 100644 --- a/src/test/scala/kinesis/mock/cache/MergeShardsTests.scala +++ b/src/test/scala/kinesis/mock/cache/MergeShardsTests.scala @@ -37,7 +37,7 @@ class MergeShardsTests Some(awsRegion) ) .rethrow - _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis)) + _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis)) adjacentParentShardId = ShardId.create(1).shardId parentShardId = ShardId.create(0).shardId _ <- cache diff --git a/src/test/scala/kinesis/mock/cache/PersistenceTests.scala b/src/test/scala/kinesis/mock/cache/PersistenceTests.scala index 718e1625..3135639c 100644 --- a/src/test/scala/kinesis/mock/cache/PersistenceTests.scala +++ b/src/test/scala/kinesis/mock/cache/PersistenceTests.scala @@ -51,7 +51,7 @@ class PersistenceTests Some(awsRegion) ) .rethrow - _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis)) + _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis)) recordRequests <- IO( putRecordRequestArb.arbitrary .take(5) diff --git a/src/test/scala/kinesis/mock/cache/PutRecordTests.scala b/src/test/scala/kinesis/mock/cache/PutRecordTests.scala index 1d345ada..c9a979ec 100644 --- a/src/test/scala/kinesis/mock/cache/PutRecordTests.scala +++ b/src/test/scala/kinesis/mock/cache/PutRecordTests.scala @@ -39,7 +39,7 @@ class PutRecordTests Some(awsRegion) ) .rethrow - _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis)) + _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis)) recordRequests <- IO( putRecordRequestArb.arbitrary .take(5) diff --git a/src/test/scala/kinesis/mock/cache/PutRecordsTests.scala b/src/test/scala/kinesis/mock/cache/PutRecordsTests.scala index 92df9d49..844e4c8a 100644 --- a/src/test/scala/kinesis/mock/cache/PutRecordsTests.scala +++ b/src/test/scala/kinesis/mock/cache/PutRecordsTests.scala @@ -39,7 +39,7 @@ class PutRecordsTests Some(awsRegion) ) .rethrow - _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis)) + _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis)) req <- IO( PutRecordsRequest( putRecordsRequestEntryArb.arbitrary diff --git a/src/test/scala/kinesis/mock/cache/RegisterStreamConsumerTests.scala b/src/test/scala/kinesis/mock/cache/RegisterStreamConsumerTests.scala index 7eaf1df4..55185f43 100644 --- a/src/test/scala/kinesis/mock/cache/RegisterStreamConsumerTests.scala +++ b/src/test/scala/kinesis/mock/cache/RegisterStreamConsumerTests.scala @@ -39,7 +39,7 @@ class RegisterStreamConsumerTests Some(awsRegion) ) .rethrow - _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis)) + _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis)) _ <- cache .registerStreamConsumer( RegisterStreamConsumerRequest(consumerName, streamArn), @@ -60,7 +60,7 @@ class RegisterStreamConsumerTests ) .rethrow _ <- IO.sleep( - cacheConfig.registerStreamConsumerDuration.plus(200.millis) + cacheConfig.registerStreamConsumerDuration.plus(400.millis) ) checkStream2 <- cache .describeStreamConsumer( diff --git a/src/test/scala/kinesis/mock/cache/SplitShardTests.scala b/src/test/scala/kinesis/mock/cache/SplitShardTests.scala index ca00f32f..e8923431 100644 --- a/src/test/scala/kinesis/mock/cache/SplitShardTests.scala +++ b/src/test/scala/kinesis/mock/cache/SplitShardTests.scala @@ -37,7 +37,7 @@ class SplitShardTests Some(awsRegion) ) .rethrow - _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis)) + _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis)) listShardsReq = ListShardsRequest( None, None, diff --git a/src/test/scala/kinesis/mock/cache/StartStreamEncryptionTests.scala b/src/test/scala/kinesis/mock/cache/StartStreamEncryptionTests.scala index c6207d16..e2740b95 100644 --- a/src/test/scala/kinesis/mock/cache/StartStreamEncryptionTests.scala +++ b/src/test/scala/kinesis/mock/cache/StartStreamEncryptionTests.scala @@ -38,7 +38,7 @@ class StartStreamEncryptionTests Some(awsRegion) ) .rethrow - _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis)) + _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis)) keyId <- IO(keyIdGen.one) _ <- cache .startStreamEncryption( @@ -57,7 +57,7 @@ class StartStreamEncryptionTests .describeStreamSummary(describeReq, context, false, Some(awsRegion)) .rethrow _ <- IO.sleep( - cacheConfig.startStreamEncryptionDuration.plus(200.millis) + cacheConfig.startStreamEncryptionDuration.plus(400.millis) ) checkStream2 <- cache .describeStreamSummary(describeReq, context, false, Some(awsRegion)) diff --git a/src/test/scala/kinesis/mock/cache/StopStreamEncryptionTests.scala b/src/test/scala/kinesis/mock/cache/StopStreamEncryptionTests.scala index 9563a198..deaa1b44 100644 --- a/src/test/scala/kinesis/mock/cache/StopStreamEncryptionTests.scala +++ b/src/test/scala/kinesis/mock/cache/StopStreamEncryptionTests.scala @@ -38,7 +38,7 @@ class StopStreamEncryptionTests Some(awsRegion) ) .rethrow - _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis)) + _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis)) keyId <- IO(keyIdGen.one) _ <- cache .startStreamEncryption( @@ -53,7 +53,7 @@ class StopStreamEncryptionTests ) .rethrow _ <- IO.sleep( - cacheConfig.startStreamEncryptionDuration.plus(200.millis) + cacheConfig.startStreamEncryptionDuration.plus(400.millis) ) _ <- cache .stopStreamEncryption( @@ -72,7 +72,7 @@ class StopStreamEncryptionTests .describeStreamSummary(describeReq, context, false, Some(awsRegion)) .rethrow _ <- IO.sleep( - cacheConfig.stopStreamEncryptionDuration.plus(200.millis) + cacheConfig.stopStreamEncryptionDuration.plus(400.millis) ) checkStream2 <- cache .describeStreamSummary(describeReq, context, false, Some(awsRegion)) diff --git a/src/test/scala/kinesis/mock/cache/UpdateShardCountTests.scala b/src/test/scala/kinesis/mock/cache/UpdateShardCountTests.scala index 9c5acf5e..2fe024f4 100644 --- a/src/test/scala/kinesis/mock/cache/UpdateShardCountTests.scala +++ b/src/test/scala/kinesis/mock/cache/UpdateShardCountTests.scala @@ -37,7 +37,7 @@ class UpdateShardCountTests Some(awsRegion) ) .rethrow - _ <- IO.sleep(cacheConfig.createStreamDuration.plus(200.millis)) + _ <- IO.sleep(cacheConfig.createStreamDuration.plus(400.millis)) res <- cache .updateShardCount( UpdateShardCountRequest( @@ -59,7 +59,7 @@ class UpdateShardCountTests Some(awsRegion) ) .rethrow - _ <- IO.sleep(cacheConfig.updateShardCountDuration.plus(200.millis)) + _ <- IO.sleep(cacheConfig.updateShardCountDuration.plus(400.millis)) checkStream2 <- cache .describeStreamSummary( describeStreamSummaryReq, diff --git a/src/test/scala/kinesis/mock/instances/arbitrary.scala b/src/test/scala/kinesis/mock/instances/arbitrary.scala index 92a330cf..6d3ee14c 100644 --- a/src/test/scala/kinesis/mock/instances/arbitrary.scala +++ b/src/test/scala/kinesis/mock/instances/arbitrary.scala @@ -213,14 +213,14 @@ object arbitrary { .choose(1, 128) .flatMap(size => Gen - .resize(size, RegexpGen.from("^([a-zA-Z0-9_./=+\\-%@ ]*)$")) + .resize(size, RegexpGen.from("^([a-zA-Z0-9_.:/=+\\-@ ]*)$")) .suchThat(x => !x.startsWith("aws:") && x.nonEmpty) ) val tagValueGen: Gen[String] = Gen .choose(0, 256) .flatMap(size => - Gen.resize(size, RegexpGen.from("^([a-zA-Z0-9_./=+\\-%@ ]*)$")) + Gen.resize(size, RegexpGen.from("^([a-zA-Z0-9_.:/=+\\-@ ]*)$")) ) val tagsGen: Gen[Tags] = Gen