After the change to provide JedisCluster via a Service,

`TestFlushRedisService` became incompatible with `RedisClusterModule`
because both services were `enhancedBy` the `ReadyService`. This
corrects that oversight

GitOrigin-RevId: b80b36bdca4ae1966844827e07d1d02575fb1c79

Author: tgregory-block

misk-redis/src/test/kotlin/misk/redis/PipelinedRedisClusterTest.kt

@@ -7,6 +7,7 @@ import misk.environment.DeploymentModule
 import misk.inject.KAbstractModule
 import misk.inject.asSingleton
 import misk.redis.testing.DockerRedisCluster
+import misk.redis.testing.RedisTestFlushModule
 import misk.testing.MiskTest
 import misk.testing.MiskTestModule
 import redis.clients.jedis.ConnectionPoolConfig
@@ -25,6 +26,7 @@ class PipelinedRedisClusterTest : AbstractRedisTest() {
       install(RedisClusterModule(DockerRedisCluster.replicationGroupConfig, ConnectionPoolConfig(), useSsl = false))
       install(MiskTestingServiceModule())
       install(DeploymentModule(TESTING))
+      install(RedisTestFlushModule())
 
       val jedisProvider = getProvider(UnifiedJedis::class.java)
       bind<Redis>().annotatedWith<AlwaysPipelined>().toProvider {

misk-redis/src/test/kotlin/misk/redis/PipelinedRedisTest.kt

@@ -7,6 +7,7 @@ import misk.environment.DeploymentModule
 import misk.inject.KAbstractModule
 import misk.inject.asSingleton
 import misk.redis.testing.DockerRedis
+import misk.redis.testing.RedisTestFlushModule
 import misk.testing.MiskTest
 import misk.testing.MiskTestModule
 import redis.clients.jedis.ConnectionPoolConfig
@@ -25,6 +26,7 @@ class PipelinedRedisTest : AbstractRedisTest() {
       install(RedisModule(DockerRedis.replicationGroupConfig, ConnectionPoolConfig(), useSsl = false))
       install(MiskTestingServiceModule())
       install(DeploymentModule(TESTING))
+      install(RedisTestFlushModule())
 
       val jedisProvider = getProvider(UnifiedJedis::class.java)
       bind<Redis>().annotatedWith<AlwaysPipelined>().toProvider {

misk-redis/src/test/kotlin/misk/redis/RealRedisClusterTest.kt

@@ -6,6 +6,7 @@ import misk.MiskTestingServiceModule
 import misk.environment.DeploymentModule
 import misk.inject.KAbstractModule
 import misk.redis.testing.DockerRedisCluster
+import misk.redis.testing.RedisTestFlushModule
 import misk.testing.MiskTest
 import misk.testing.MiskTestModule
 import redis.clients.jedis.ConnectionPoolConfig
@@ -20,6 +21,7 @@ class RealRedisClusterTest : AbstractRedisClusterTest() {
       install(RedisClusterModule(DockerRedisCluster.replicationGroupConfig, ConnectionPoolConfig(), useSsl = false))
       install(MiskTestingServiceModule())
       install(DeploymentModule(TESTING))
+      install(RedisTestFlushModule())
     }
   }
 

misk-redis/src/test/kotlin/misk/redis/RealRedisTest.kt

@@ -6,6 +6,7 @@ import misk.MiskTestingServiceModule
 import misk.environment.DeploymentModule
 import misk.inject.KAbstractModule
 import misk.redis.testing.DockerRedis
+import misk.redis.testing.RedisTestFlushModule
 import misk.testing.MiskTest
 import misk.testing.MiskTestModule
 import okio.ByteString.Companion.encodeUtf8
@@ -24,6 +25,7 @@ class RealRedisTest : AbstractRedisTest() {
       install(RedisModule(DockerRedis.replicationGroupConfig, ConnectionPoolConfig(), useSsl = false))
       install(MiskTestingServiceModule())
       install(DeploymentModule(TESTING))
+      install(RedisTestFlushModule())
     }
   }
 

misk-redis/src/test/kotlin/misk/redis/RedisClientMetricsTest.kt

@@ -1,6 +1,7 @@
 package misk.redis
 
 import io.prometheus.client.CollectorRegistry
+import jakarta.inject.Inject
 import misk.MiskTestingServiceModule
 import misk.environment.DeploymentModule
 import misk.inject.KAbstractModule
@@ -11,14 +12,14 @@ import misk.redis.RedisClientMetrics.Companion.MAX_IDLE_CONNECTIONS
 import misk.redis.RedisClientMetrics.Companion.MAX_TOTAL_CONNECTIONS
 import misk.redis.RedisClientMetrics.Companion.OPERATION_TIME
 import misk.redis.testing.DockerRedis
+import misk.redis.testing.RedisTestFlushModule
 import misk.testing.MiskTest
 import misk.testing.MiskTestModule
 import okio.ByteString.Companion.encodeUtf8
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
-import wisp.deployment.TESTING
-import jakarta.inject.Inject
 import redis.clients.jedis.ConnectionPoolConfig
+import wisp.deployment.TESTING
 
 @MiskTest
 class RedisClientMetricsTest {
@@ -28,6 +29,7 @@ class RedisClientMetricsTest {
       install(DeploymentModule(TESTING))
       install(MiskTestingServiceModule())
       install(RedisModule(DockerRedis.replicationGroupConfig, ConnectionPoolConfig(), useSsl = false))
+      install(RedisTestFlushModule())
     }
   }
 

misk-redis/src/testFixtures/kotlin/misk/redis/testing/RedisTestFlushModule.kt

@@ -13,7 +13,7 @@ class RedisTestFlushModule : KAbstractModule() {
   override fun configure() {
     install(
       ServiceModule<RedisFlushService>()
-        .enhancedBy<ReadyService>()
+        .dependsOn<ReadyService>()
     )
     bind<TestFixture>().to<RedisFlushService>()
   }