Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ object Dependencies {
val scalaJavaTimeV = "2.6.0"
val sttpV = "4.0.13"
val tapirV = "1.12.6"
val zioV = "2.1.22"
val zioV = "2.1.23"
val zioConfigV = "4.0.6"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ object RedisClientSpec extends ZIOSpecDefault {
suite("RedisStringOperations")(RedisStringOperationsSpec.specs.map(toSpec)),
suite("RedisTopicOperations")(RedisTopicOperationsSpec.specs.map(toSpec)) @@
TestAspect.withLiveClock
).provideLayerShared(redisLive) @@ TestAspect.parallel @@
TestAspect.timeout(30.seconds) // @@ TestAspect.ignore
).provideLayerShared(redisLive) @@ testAspect(30.seconds) // @@ TestAspect.ignore

}
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ object RedissonNativeSpec extends ZIOSpecDefault with DefaultRedisCodecs {
case1 <- ZIO.fromOption(redisCheckO).forEachZIO(_.checkAvailability).map(_.getOrElse(false))
} yield assertTrue(!case1)
).provideLayer(live(pingTimeout = testPingTimeout))
).provideLayerShared(redisSingleContainerLive) @@ TestAspect.parallel @@
TestAspect.timeout(10.seconds) // @@ TestAspect.ignore
).provideLayerShared(redisSingleContainerLive) @@ testAspect(10.seconds) // @@ TestAspect.ignore

}
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ object RedissonSentinelSpec extends ZIOSpecDefault with DefaultRedisCodecs {
case1 <- ZIO.fromOption(redisCheckO).forEachZIO(_.checkAvailability).map(_.getOrElse(false))
} yield assertTrue(!case1)
).provideLayer(live(pingTimeout = testPingTimeout))
).provideLayerShared(RedisSentinelContainers.live) @@ TestAspect.parallel @@
TestAspect.timeout(10.seconds) // @@ TestAspect.ignore
).provideLayerShared(RedisSentinelContainers.live) @@
testAspect(10.seconds) // @@ TestAspect.ignore

}
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ object RedissonSingleSpec extends ZIOSpecDefault with DefaultRedisCodecs {
case1 <- ZIO.fromOption(redisCheckO).forEachZIO(_.checkAvailability).map(_.getOrElse(false))
} yield assertTrue(!case1)
).provideLayer(live(pingTimeout = testPingTimeout))
).provideLayerShared(redisSingleContainerLive) @@ TestAspect.parallel @@
TestAspect.timeout(10.seconds) // @@ TestAspect.ignore
).provideLayerShared(redisSingleContainerLive) @@ testAspect(10.seconds) // @@ TestAspect.ignore

}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package io.kinoplan.utils.zio

import com.redis.testcontainers.RedisContainer
import org.testcontainers.utility.DockerImageName
import zio.{Duration, Scope, Task, URIO, ZIO, ZLayer}
import zio.test.{Spec, TestResult}
import zio._
import zio.test.{Spec, TestAspect, TestResult}

import io.kinoplan.utils.IntegrationCheck
import io.kinoplan.utils.zio.redisson.RedissonSentinelSpec.test
Expand All @@ -17,6 +17,11 @@ package object redisson {
val testConfigurator: Int = 128
val testPingTimeout: Duration = Duration.Zero

val retrySchedule = Schedule.spaced(5.seconds) && Schedule.recurs(3)

def testAspect(timeout: Duration) = TestAspect.parallel @@ TestAspect.timeout(timeout) @@
TestAspect.retry(retrySchedule)

val commonConfig: Map[String, String] = Map(
"lazyInitialization" -> "true",
"nettyThreads" -> "64",
Expand Down
Loading