Skip to content

Commit f1565f1

Browse files
rnorthbsideup
rnorth
authored and
bsideup
committed
Fail gracefully if no JDBC driver found (#1434)
* WIP * Simplify code * Ensure that HikariCP uses the correct driver (Auto-selected driver on classpath seems to be MariaDB; seemingly not compatible with 8.0.16 of MySQL) * Cleanup old Hikari pools after use to avoid reconnection attempts to dead containers after test has already completed * Update following review comments
1 parent 151b93a commit f1565f1

File tree

31 files changed

+229
-227
lines changed

31 files changed

+229
-227
lines changed

‎core/src/main/java/org/testcontainers/containers/ContainerLaunchException.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public ContainerLaunchException(String message) {
99
super(message);
1010
}
1111

12-
public ContainerLaunchException(String message, Exception exception) {
13-
super(message, exception);
12+
public ContainerLaunchException(String message, Throwable cause) {
13+
super(message, cause);
1414
}
1515
}

‎core/src/test/resources/logback-test.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@
1414

1515
<logger name="org.testcontainers" level="DEBUG"/>
1616

17-
<logger name="org.apache.http" level="WARN"/>
1817
<logger name="com.github.dockerjava" level="WARN"/>
1918
<logger name="org.zeroturnaround.exec" level="WARN"/>
20-
<logger name="io.netty" level="WARN" />
2119
<logger name="org.testcontainers.shaded" level="WARN"/>
2220

2321
</configuration>

‎docs/examples/src/test/resources/logback-test.xml‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<configuration>
2-
32
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
43
<!-- encoders are assigned the type
54
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
@@ -11,17 +10,4 @@
1110
<root level="INFO">
1211
<appender-ref ref="STDOUT"/>
1312
</root>
14-
15-
<logger name="org.testcontainers" level="INFO"/>
16-
17-
<logger name="org.apache.http" level="WARN"/>
18-
<logger name="com.github.dockerjava" level="WARN"/>
19-
<logger name="org.zeroturnaround.exec" level="WARN"/>
20-
<logger name="io.netty" level="WARN" />
21-
<logger name="org.testcontainers.shaded" level="WARN"/>
22-
23-
<turboFilter class="ch.qos.logback.classic.turbo.MarkerFilter">
24-
<Marker>PROFILER</Marker>
25-
<OnMatch>DENY</OnMatch>
26-
</turboFilter>
2713
</configuration>

‎examples/disque-job-queue/src/test/resources/logback-test.xml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@
44
<!-- encoders are assigned the type
55
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
66
<encoder>
7-
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
7+
<pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
88
</encoder>
99
</appender>
1010

11-
<root level="info">
11+
<root level="INFO">
1212
<appender-ref ref="STDOUT"/>
1313
</root>
14-
15-
<logger name="org.apache.http" level="WARN"/>
16-
<logger name="com.github.dockerjava" level="WARN"/>
17-
<logger name="org.zeroturnaround.exec" level="WARN"/>
18-
</configuration>
14+
</configuration>

‎examples/linked-container/src/test/resources/logback-test.xml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
<configuration>
2+
23
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<!-- encoders are assigned the type
5+
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
36
<encoder>
4-
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
7+
<pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
58
</encoder>
69
</appender>
710

8-
<root level="info">
11+
<root level="INFO">
912
<appender-ref ref="STDOUT"/>
1013
</root>
11-
12-
<logger name="org.testcontainers" level="INFO"/>
13-
<logger name="org.apache.http" level="WARN"/>
14-
<logger name="com.github.dockerjava" level="WARN"/>
15-
<logger name="org.zeroturnaround.exec" level="WARN"/>
16-
</configuration>
14+
</configuration>

‎examples/redis-backed-cache-testng/src/test/resources/logback-test.xml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@
44
<!-- encoders are assigned the type
55
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
66
<encoder>
7-
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
7+
<pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
88
</encoder>
99
</appender>
1010

11-
<root level="info">
11+
<root level="INFO">
1212
<appender-ref ref="STDOUT"/>
1313
</root>
14-
15-
<logger name="org.apache.http" level="WARN"/>
16-
<logger name="com.github.dockerjava" level="WARN"/>
17-
<logger name="org.zeroturnaround.exec" level="WARN"/>
18-
</configuration>
14+
</configuration>

‎examples/redis-backed-cache/src/test/resources/logback-test.xml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@
44
<!-- encoders are assigned the type
55
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
66
<encoder>
7-
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
7+
<pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
88
</encoder>
99
</appender>
1010

11-
<root level="info">
11+
<root level="INFO">
1212
<appender-ref ref="STDOUT"/>
1313
</root>
14-
15-
<logger name="org.apache.http" level="WARN"/>
16-
<logger name="com.github.dockerjava" level="WARN"/>
17-
<logger name="org.zeroturnaround.exec" level="WARN"/>
18-
</configuration>
14+
</configuration>

‎examples/selenium-container/src/test/resources/logback-test.xml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@
44
<!-- encoders are assigned the type
55
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
66
<encoder>
7-
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
7+
<pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
88
</encoder>
99
</appender>
1010

11-
<root level="info">
11+
<root level="INFO">
1212
<appender-ref ref="STDOUT"/>
1313
</root>
14-
15-
<logger name="org.apache.http" level="WARN"/>
16-
<logger name="com.github.dockerjava" level="WARN"/>
17-
<logger name="org.zeroturnaround.exec" level="WARN"/>
18-
</configuration>
14+
</configuration>

‎examples/spock/src/test/resources/logback-test.xml‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,5 @@
1212
<appender-ref ref="STDOUT"/>
1313
</root>
1414

15-
<logger name="org.testcontainers" level="INFO"/>
16-
17-
<logger name="org.apache.http" level="WARN"/>
18-
<logger name="com.github.dockerjava" level="WARN"/>
19-
<logger name="org.zeroturnaround.exec" level="WARN"/>
20-
<logger name="io.netty" level="WARN"/>
21-
<logger name="org.testcontainers.shaded" level="WARN"/>
22-
23-
<turboFilter class="ch.qos.logback.classic.turbo.MarkerFilter">
24-
<Marker>PROFILER</Marker>
25-
<OnMatch>DENY</OnMatch>
26-
</turboFilter>
15+
<logger name="org.testcontainers" level="DEBUG"/>
2716
</configuration>

‎examples/spring-boot/src/test/resources/logback-test.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
<configuration>
2-
32
<include resource="org/springframework/boot/logging/logback/base.xml"/>
4-
5-
<logger name="org.apache.http" level="WARN"/>
6-
<logger name="com.github.dockerjava" level="WARN"/>
7-
<logger name="org.zeroturnaround.exec" level="WARN"/>
8-
</configuration>
3+
</configuration>

0 commit comments

Comments
 (0)