Skip to content

Commit 6951917

Browse files
author
julien
committed
Added check for active container on teardown
1 parent 1fe4938 commit 6951917

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

subprojects/testcontainers-redis-junit/src/main/java/com/redis/testcontainers/junit/AbstractTestcontainersRedisTestBase.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,11 @@ public abstract class AbstractTestcontainersRedisTestBase {
4444
protected void setup() {
4545
Assumptions.assumeTrue(redisServers().stream().anyMatch(RedisServer::isActive));
4646
for (RedisServer server : redisServers()) {
47-
if (!server.isActive()) {
48-
continue;
47+
if (server.isActive()) {
48+
log.info("Starting container {}", server);
49+
server.start();
50+
contexts.put(server, new RedisTestContext(server));
4951
}
50-
log.info("Starting container {}", server);
51-
server.start();
52-
contexts.put(server, new RedisTestContext(server));
5352
}
5453
}
5554

@@ -68,8 +67,10 @@ protected Collection<RedisTestContext> getRedisTestContexts() {
6867
@BeforeEach
6968
protected void flushAll() {
7069
contexts.forEach((k, v) -> {
71-
v.sync().flushall();
72-
Awaitility.await().until(() -> v.sync().dbsize() == 0);
70+
if (k.isActive()) {
71+
v.sync().flushall();
72+
Awaitility.await().until(() -> v.sync().dbsize() == 0);
73+
}
7374
});
7475
}
7576

subprojects/testcontainers-redis-junit/src/main/java/com/redis/testcontainers/junit/RedisTestContext.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ public RedisTestContext(RedisServer server) {
2222
this.server = server;
2323
}
2424

25-
@Override
26-
public String toString() {
27-
return server.toString();
28-
}
29-
3025
public RedisServer getServer() {
3126
return server;
3227
}

0 commit comments

Comments
 (0)