From fca1dd661a2dd1f65100d1966cbc2bc111ead795 Mon Sep 17 00:00:00 2001 From: Martin Kanters Date: Thu, 8 Jun 2023 15:44:00 +0200 Subject: [PATCH] [MNG-7338] Disable CI mode for certain tests which verify on log statements. (#209) --- .../maven/it/MavenITmng4461ArtifactUploadMonitorTest.java | 1 + .../maven/it/MavenITmng4829ChecksumFailureWarningTest.java | 1 + .../maven/it/MavenITmng6240PluginExtensionAetherProvider.java | 2 ++ 3 files changed, 4 insertions(+) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java index ce7b9f7fc2..d44b9daba4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java @@ -47,6 +47,7 @@ public class MavenITmng4461ArtifactUploadMonitorTest extends AbstractMavenIntegr Verifier verifier = newVerifier(testDir.getAbsolutePath()); verifier.setAutoclean(false); verifier.deleteDirectory("target"); + verifier.setEnvironmentVariable("CI", "false"); verifier.addCliArgument("validate"); verifier.execute(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java index e678b0e228..6954018de9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java @@ -51,6 +51,7 @@ public class MavenITmng4829ChecksumFailureWarningTest extends AbstractMavenInteg verifier.deleteArtifacts("org.apache.maven.its.mng4829"); verifier.addCliArgument("-s"); verifier.addCliArgument("settings.xml"); + verifier.setEnvironmentVariable("CI", "false"); verifier.filterFile("settings-template.xml", "settings.xml", "UTF-8"); verifier.addCliArgument("validate"); verifier.execute(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java index 1dfe0abb1f..39dcffa9ed 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java @@ -55,11 +55,13 @@ public class MavenITmng6240PluginExtensionAetherProvider extends AbstractMavenIn File projectDir = new File(testDir, "project"); Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote"); + verifier.setEnvironmentVariable("CI", "false"); verifier.addCliArgument("install"); verifier.execute(); verifier.verifyErrorFreeLog(); verifier = newVerifier(projectDir.getAbsolutePath(), "remote"); + verifier.setEnvironmentVariable("CI", "false"); verifier.addCliArgument("deploy"); verifier.execute(); verifier.verifyErrorFreeLog();