From a5e8b592ca799821be20432438f52a4e23bfa413 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Mon, 25 Nov 2024 13:01:16 -0800 Subject: [PATCH] Remove JENKINS-74890 workaround (#1846) --- .../java/org/jenkinsci/test/acceptance/junit/CspRule.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/jenkinsci/test/acceptance/junit/CspRule.java b/src/main/java/org/jenkinsci/test/acceptance/junit/CspRule.java index 286e24a7e..b9805315a 100644 --- a/src/main/java/org/jenkinsci/test/acceptance/junit/CspRule.java +++ b/src/main/java/org/jenkinsci/test/acceptance/junit/CspRule.java @@ -24,8 +24,7 @@ public Statement apply(final Statement base, final Description d) { public void evaluate() throws Throwable { Jenkins jenkins = injector.getInstance(Jenkins.class); - // TODO enable for LogParserTest when JENKINS-74890 is resolved - if (isEnabled() && !isSkipped() && !d.getTestClass().getName().equals("plugins.LogParserTest")) { + if (isEnabled() && !isSkipped()) { PluginSpec plugin = new PluginSpec("csp"); jenkins.getPluginManager().installPlugins(plugin); @@ -38,11 +37,9 @@ public void evaluate() throws Throwable { base.evaluate(); } finally { // TODO enable for ArtifactoryPluginTest when JENKINS-74047 is resolved - // TODO enable for LogParserTest when JENKINS-74890 is resolved if (isEnabled() && !isSkipped() - && !d.getTestClass().getName().equals("plugins.ArtifactoryPluginTest") - && !d.getTestClass().getName().equals("plugins.LogParserTest")) { + && !d.getTestClass().getName().equals("plugins.ArtifactoryPluginTest")) { ContentSecurityPolicyReport csp = new ContentSecurityPolicyReport(jenkins); csp.open(); List lines = csp.getReport();