Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove JENKINS-74890 workaround #1846

Merged
merged 1 commit into from
Nov 25, 2024
Merged

Remove JENKINS-74890 workaround #1846

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/main/java/org/jenkinsci/test/acceptance/junit/CspRule.java
View file
Open in desktop
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
Loading