Skip to content

Commit 141d8ef

Browse files
mijicdmijicd
authored
Reduce the amount of retries (zio#910)
1 parent 1875ac2 commit 141d8ef

File tree

6 files changed

+19
-16
lines changed

6 files changed

+19
-16
lines changed

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ jobs:
216216
- name: Cache Dependencies
217217
uses: coursier/cache-action@v6
218218
- name: Setup NodeJs
219-
uses: actions/setup-node@v4
219+
uses: actions/setup-node@v3
220220
with:
221221
node-version: 16.x
222222
registry-url: https://registry.npmjs.org

‎modules/redis-it/src/test/scala/zio/redis/ApiSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ object ApiSpec
4949
masterNodeConfig,
5050
ZLayer.succeed(ProtobufCodecSupplier)
5151
).filterNotTags(_.contains(BaseSpec.ClusterExecutorUnsupported))
52-
.getOrElse(Spec.empty) @@ eventually
52+
.getOrElse(Spec.empty) @@ flaky @@ ifEnvNotSet("CI")
5353

5454
private final val SingleNodeSuite =
5555
suite("Single node executor")(

‎modules/redis-it/src/test/scala/zio/redis/KeysSpec.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ trait KeysSpec extends BaseSpec {
247247
_ <- redis.pSetEx(key, 1000.millis, value)
248248
ttl <- redis.ttl(key).either
249249
} yield assert(ttl)(isRight)
250-
} @@ eventually,
250+
} @@ flaky,
251251
test("check ttl for non-existing key") {
252252
for {
253253
redis <- ZIO.service[Redis]
@@ -263,7 +263,7 @@ trait KeysSpec extends BaseSpec {
263263
_ <- redis.pSetEx(key, 1000.millis, value)
264264
pTtl <- redis.pTtl(key).either
265265
} yield assert(pTtl)(isRight)
266-
} @@ eventually,
266+
} @@ flaky,
267267
test("check pTtl for non-existing key") {
268268
for {
269269
redis <- ZIO.service[Redis]

‎modules/redis-it/src/test/scala/zio/redis/PubSubSpec.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package zio.redis
22

33
import zio.test.Assertion._
4+
import zio.test.TestAspect.{flaky, ifEnvNotSet}
45
import zio.test._
56
import zio.{Promise, ZIO}
67

@@ -237,7 +238,7 @@ trait PubSubSpec extends BaseSpec {
237238
)
238239
}
239240
)
240-
) @@ TestAspect.eventually
241+
) @@ flaky @@ ifEnvNotSet("CI")
241242

242243
private def generateRandomString(prefix: String = "") =
243244
ZIO.succeed(Random.alphanumeric.take(15).mkString).map(prefix + _.substring((prefix.length - 1) max 0))

‎modules/redis-it/src/test/scala/zio/redis/StringsSpec.scala

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package zio.redis
33
import zio._
44
import zio.redis.RedisError.{ProtocolError, WrongType}
55
import zio.test.Assertion.{exists => _, _}
6-
import zio.test.TestAspect.{eventually, ignore}
6+
import zio.test.TestAspect.{flaky, ignore}
77
import zio.test._
88

99
trait StringsSpec extends BaseSpec {
@@ -1421,7 +1421,7 @@ trait StringsSpec extends BaseSpec {
14211421
_ <- fiber.join
14221422
existsAfter <- redis.exists(key)
14231423
} yield assert(existsBefore)(equalTo(1L)) && assert(existsAfter)(equalTo(0L))
1424-
} @@ eventually,
1424+
} @@ flaky,
14251425
test("override existing string") {
14261426
for {
14271427
redis <- ZIO.service[Redis]
@@ -1634,7 +1634,7 @@ trait StringsSpec extends BaseSpec {
16341634
_ <- fiber.join
16351635
existsAfter <- redis.exists(key)
16361636
} yield assert(existsBefore)(equalTo(1L)) && assert(existsAfter)(equalTo(0L))
1637-
} @@ eventually,
1637+
} @@ flaky,
16381638
test("existing value with 1 second ttl") {
16391639
for {
16401640
redis <- ZIO.service[Redis]
@@ -1647,7 +1647,7 @@ trait StringsSpec extends BaseSpec {
16471647
_ <- fiber.join
16481648
existsAfter <- redis.exists(key)
16491649
} yield assert(existsBefore)(equalTo(1L)) && assert(existsAfter)(equalTo(0L))
1650-
} @@ eventually,
1650+
} @@ flaky,
16511651
test("override when not string") {
16521652
for {
16531653
redis <- ZIO.service[Redis]
@@ -1783,7 +1783,7 @@ trait StringsSpec extends BaseSpec {
17831783
_ <- fiber.join
17841784
res <- redis.get(key).returning[String]
17851785
} yield assert(res.isDefined)(equalTo(true)) && assert(exists)(equalTo(Some(value)))
1786-
} @@ eventually,
1786+
} @@ flaky,
17871787
test("not found value when set seconds ttl") {
17881788
for {
17891789
redis <- ZIO.service[Redis]
@@ -1795,7 +1795,7 @@ trait StringsSpec extends BaseSpec {
17951795
_ <- fiber.join
17961796
res <- redis.get(key).returning[String]
17971797
} yield assert(res.isDefined)(equalTo(false)) && assert(exists)(equalTo(Some(value)))
1798-
} @@ eventually,
1798+
} @@ flaky,
17991799
test("not found value when set milliseconds ttl") {
18001800
for {
18011801
redis <- ZIO.service[Redis]
@@ -1807,7 +1807,7 @@ trait StringsSpec extends BaseSpec {
18071807
_ <- fiber.join
18081808
res <- redis.get(key).returning[String]
18091809
} yield assert(res.isDefined)(equalTo(false)) && assert(exists)(equalTo(Some(value)))
1810-
} @@ eventually,
1810+
} @@ flaky,
18111811
test("not found value when set seconds timestamp") {
18121812
for {
18131813
redis <- ZIO.service[Redis]
@@ -1820,7 +1820,7 @@ trait StringsSpec extends BaseSpec {
18201820
_ <- fiber.join
18211821
res <- redis.get(key).returning[String]
18221822
} yield assert(res.isDefined)(equalTo(false)) && assert(exists)(equalTo(Some(value)))
1823-
} @@ eventually,
1823+
} @@ flaky,
18241824
test("not found value when set milliseconds timestamp") {
18251825
for {
18261826
redis <- ZIO.service[Redis]
@@ -1833,7 +1833,7 @@ trait StringsSpec extends BaseSpec {
18331833
_ <- fiber.join
18341834
res <- redis.get(key).returning[String]
18351835
} yield assert(res.isDefined)(equalTo(false)) && assert(exists)(equalTo(Some(value)))
1836-
} @@ eventually,
1836+
} @@ flaky,
18371837
test("key not found") {
18381838
for {
18391839
redis <- ZIO.service[Redis]
@@ -1845,7 +1845,7 @@ trait StringsSpec extends BaseSpec {
18451845
res2 <- redis.getEx(value, Expire.SetExpireMilliseconds, 10.millis).returning[String]
18461846
res3 <- redis.getEx(value, true).returning[String]
18471847
} yield assert(res)(equalTo(None)) && assert(res2)(equalTo(None)) && assert(res3)(equalTo(None))
1848-
} @@ eventually
1848+
} @@ flaky
18491849
),
18501850
suite("getDel")(
18511851
test("error when not string") {

‎modules/redis-it/src/test/scala/zio/redis/internal/ClusterExecutorSpec.scala

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package zio.redis.internal
2+
23
import zio._
34
import zio.redis._
45
import zio.redis.options.Cluster.{Slot, SlotsAmount}
6+
import zio.test.TestAspect.{flaky, ifEnvNotSet}
57
import zio.test._
68

79
object ClusterExecutorSpec extends BaseSpec {
@@ -63,7 +65,7 @@ object ClusterExecutorSpec extends BaseSpec {
6365
compose(service(BaseSpec.MasterNode, ".*Cluster correctly created.*")),
6466
masterNodeConfig,
6567
ZLayer.succeed(ProtobufCodecSupplier)
66-
) @@ TestAspect.flaky
68+
) @@ flaky @@ ifEnvNotSet("CI")
6769

6870
private def redisNodeLayer(uri: RedisUri): Layer[Any, Redis] =
6971
ZLayer.make[Redis](

0 commit comments

Comments
 (0)