Skip to content

Commit

Permalink
Remove JENKINS-74890 workaround (#1846)
Browse files Browse the repository at this point in the history
  • Loading branch information
basil authored Nov 25, 2024
1 parent d39ba3f commit a5e8b59
Showing 1 changed file with 2 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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<String> lines = csp.getReport();
Expand Down

0 comments on commit a5e8b59

Please sign in to comment.