NO-JIRA: suppress significant teardown stacktraces after compatibility test that is a no-op...make test itself skip

This commit is contained in:
Robbie Gemmell 2022-06-17 13:02:37 +01:00
parent d0d2a9a16b
commit 196e604778
1 changed files with 13 additions and 4 deletions

View File

@ -24,6 +24,7 @@ import java.util.List;
import org.apache.activemq.artemis.tests.compatibility.base.VersionedBase; import org.apache.activemq.artemis.tests.compatibility.base.VersionedBase;
import org.apache.activemq.artemis.utils.FileUtil; import org.apache.activemq.artemis.utils.FileUtil;
import org.junit.After; import org.junit.After;
import org.junit.Assume;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@ -48,6 +49,7 @@ import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
public class ExportImportTest extends VersionedBase { public class ExportImportTest extends VersionedBase {
private String serverScriptToUse; private String serverScriptToUse;
private boolean skipTearDownCleanup = false;
// this will ensure that all tests in this class are run twice, // this will ensure that all tests in this class are run twice,
// once with "true" passed to the class' constructor and once with "false" // once with "true" passed to the class' constructor and once with "false"
@ -81,6 +83,11 @@ public class ExportImportTest extends VersionedBase {
@After @After
public void tearDown() { public void tearDown() {
if (skipTearDownCleanup) {
// Skip server teardown when test is no-op, avoids a chunk of stacktrace
return;
}
try { try {
stopServer(serverClassloader); stopServer(serverClassloader);
} catch (Throwable ignored) { } catch (Throwable ignored) {
@ -100,11 +107,13 @@ public class ExportImportTest extends VersionedBase {
@Test @Test
public void testSendReceivelegacy() throws Throwable { public void testSendReceivelegacy() throws Throwable {
if (!sender.equals(SNAPSHOT)) {
// makes no sense on snapshot // makes no sense on snapshot
boolean isSenderSnapshot = SNAPSHOT.equals(sender);
skipTearDownCleanup = isSenderSnapshot;
Assume.assumeFalse("This test only applies to old version senders", isSenderSnapshot);
internalSendReceive(true); internalSendReceive(true);
} }
}
public void internalSendReceive(boolean legacyPrefixes) throws Throwable { public void internalSendReceive(boolean legacyPrefixes) throws Throwable {
setVariable(senderClassloader, "legacy", false); setVariable(senderClassloader, "legacy", false);