Skip to content

Commit 9fb9c41

Browse files
committed
Properly isolate the ITs in a Failsafe execution
The ITs were run as part of the Surefire execution and apparently something is leaking from them. It wasn't an issue before because they were executed at the end of the run but they were executed first with the new orderer given they are not annotated with a Quarkus test annotation. (cherry picked from commit 1abb1b9)
1 parent 8203603 commit 9fb9c41

File tree

9 files changed

+26
-18
lines changed

9 files changed

+26
-18
lines changed

integration-tests/test-extension/tests/pom.xml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -148,16 +148,24 @@
148148
</plugin>
149149
<plugin>
150150
<artifactId>maven-failsafe-plugin</artifactId>
151-
<configuration>
152-
<systemPropertyVariables>
153-
<!-- See io.quarkus.extest.runtime.classpath.RecordedClasspathEntries -->
154-
<classpathEntriesRecordingFile>${project.build.directory}/recorded-classpath-entries-failsafe.txt</classpathEntriesRecordingFile>
155-
<quarkus.dymmy>test</quarkus.dymmy>
156-
</systemPropertyVariables>
157-
<environmentVariables>
158-
<DUMMY_AGE>70</DUMMY_AGE> <!-- Used to test that env vars are propagated -->
159-
</environmentVariables>
160-
</configuration>
151+
<executions>
152+
<execution>
153+
<goals>
154+
<goal>integration-test</goal>
155+
<goal>verify</goal>
156+
</goals>
157+
<configuration>
158+
<systemPropertyVariables>
159+
<!-- See io.quarkus.extest.runtime.classpath.RecordedClasspathEntries -->
160+
<classpathEntriesRecordingFile>${project.build.directory}/recorded-classpath-entries-failsafe.txt</classpathEntriesRecordingFile>
161+
<quarkus.dymmy>test</quarkus.dymmy>
162+
</systemPropertyVariables>
163+
<environmentVariables>
164+
<DUMMY_AGE>70</DUMMY_AGE> <!-- Used to test that env vars are propagated -->
165+
</environmentVariables>
166+
</configuration>
167+
</execution>
168+
</executions>
161169
</plugin>
162170
</plugins>
163171
</build>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
@Disabled("https://github.com/quarkusio/quarkus/issues/27057")
2222
@DisabledIfSystemProperty(named = "quarkus.test.native", matches = "true")
23-
public class TestAvroMultimoduleIT extends MojoTestBase {
23+
public class AvroMultimoduleIT extends MojoTestBase {
2424
@Test
2525
public void testThatTheTestsPassed() throws MavenInvocationException, InterruptedException {
2626
File testDir = initProject("projects/avro-multimodule-project", "projects/avro-multimodule-project-build");
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
@DisabledIfSystemProperty(named = "quarkus.test.native", matches = "true")
2525
@Disabled // Tracked by #22611
26-
public class TestCallbackDevModeIT extends RunAndCheckMojoTestBase {
26+
public class CallbackDevModeIT extends RunAndCheckMojoTestBase {
2727

2828
/*
2929
* We have a few tests that will run in parallel, so set a unique port
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
@Disabled // Tracked by #22611
2323
@DisabledIfSystemProperty(named = "quarkus.test.native", matches = "true")
24-
public class TestCallbackTestModeIT extends RunAndCheckMojoTestBase {
24+
public class CallbackTestModeIT extends RunAndCheckMojoTestBase {
2525

2626
/*
2727
* We have a few tests that will run in parallel, so set a unique port
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* mvn install -Dit.test=DevMojoIT#methodName
2222
*/
2323
@DisabledIfSystemProperty(named = "quarkus.test.native", matches = "true")
24-
public class TestParameterDevModeIT extends RunAndCheckMojoTestBase {
24+
public class ParameterDevModeIT extends RunAndCheckMojoTestBase {
2525

2626
protected int getPort() {
2727
return 8098;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
@DisabledIfSystemProperty(named = "quarkus.test.native", matches = "true")
2424
@Disabled("The base function now works via quarkus:test, but the test infrastructure for seeing how many tests ran needs the dev ui to be running")
25-
public class TestParameterTestModeIT extends RunAndCheckMojoTestBase {
25+
public class ParameterTestModeIT extends RunAndCheckMojoTestBase {
2626

2727
@Override
2828
protected LaunchMode getDefaultLaunchMode() {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
@DisabledIfSystemProperty(named = "quarkus.test.native", matches = "true")
2525
@Disabled // Tracked by #27821
26-
public class TestTemplateCanSeeByteCodeChangesDevModeIT extends RunAndCheckMojoTestBase {
26+
public class TemplateCanSeeByteCodeChangesDevModeIT extends RunAndCheckMojoTestBase {
2727

2828
/*
2929
* We have a few tests that will run in parallel, so set a unique port
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
@Disabled // Tracked by #27821
2323
@DisabledIfSystemProperty(named = "quarkus.test.native", matches = "true")
24-
public class TestTemplateCanSeeByteCodeChangesTestModeIT extends RunAndCheckMojoTestBase {
24+
public class TemplateCanSeeByteCodeChangesTestModeIT extends RunAndCheckMojoTestBase {
2525

2626
/*
2727
* We have a few tests that will run in parallel, so set a unique port
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* mvn install -Dit.test=TestTemplateDevModeIT#methodName
2222
*/
2323
@DisabledIfSystemProperty(named = "quarkus.test.native", matches = "true")
24-
public class TestTemplateDevModeIT extends RunAndCheckMojoTestBase {
24+
public class TemplateDevModeIT extends RunAndCheckMojoTestBase {
2525

2626
/*
2727
* We have a few tests that will run in parallel, so set a unique port

0 commit comments

Comments
 (0)