File tree 2 files changed +6
-4
lines changed
integration-tests/main-app-test/src/test/java/co/elastic/apm/test
2 files changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -66,9 +66,11 @@ void testSecurityManagerWarning() {
66
66
try (AgentTestContainer .JarApp app = testAppWithJavaAgent ("openjdk:17" , AgentFileAccessor .Variant .STANDARD )) {
67
67
68
68
app .withSecurityManager (null )
69
- .waitingFor (Wait .forLogMessage (expectedMsg , 1 ))
69
+ // using a dummy command since testcontainers 1.21.0 as waiting on stderr msg is not working anymore
70
+ // when the container fails to start. Likely related to https://github.com/testcontainers/testcontainers-java/issues/9956
71
+ .waitingFor (Wait .forLogMessage (".*processing of -javaagent failed, processJavaStart failed.*" , 1 ))
70
72
// we expect startup to fail fast as JVM should not even properly start
71
- .withStartupTimeout (Duration .ofSeconds (1 ));
73
+ .withStartupTimeout (Duration .ofSeconds (3 ));
72
74
73
75
app .start ();
74
76
@@ -83,7 +85,7 @@ void testSecurityManagerWithPolicy(@TempDir Path temp) throws IOException {
83
85
84
86
// use a 'grant all' policy for now
85
87
Files .write (tempPolicy , Arrays .asList (
86
- "grant codeBase \" file:///tmp/elastic-apm- agent.jar\" {" ,
88
+ "grant codeBase \" file:///agent.jar\" {" ,
87
89
" permission java.security.AllPermission;" ,
88
90
"};" ), StandardOpenOption .CREATE
89
91
);
Original file line number Diff line number Diff line change 139
139
<!-- used both for plugin & annotations dependency -->
140
140
<version .animal-sniffer>1.17</version .animal-sniffer>
141
141
142
- <version .testcontainers>1.20.3 </version .testcontainers>
142
+ <version .testcontainers>1.21.0 </version .testcontainers>
143
143
144
144
<!-- latest version compiled for java 11 -->
145
145
<version .jsonunit>2.38.0</version .jsonunit>
You can’t perform that action at this time.
0 commit comments