Skip to content

Fix references to RealJenkinsRule.JenkinsStartupException#36

Merged
jtnord merged 4 commits intojenkinsci:masterfrom
strangelookingnerd:patch-1
Jan 7, 2026
Merged

Fix references to RealJenkinsRule.JenkinsStartupException#36
jtnord merged 4 commits intojenkinsci:masterfrom
strangelookingnerd:patch-1

Conversation

@strangelookingnerd
Copy link
Contributor

@strangelookingnerd strangelookingnerd commented Jan 2, 2026

See jenkinsci/jenkins#26020 for some context and additional information

Testing done

None, rely on ci.jenkins.io to test it.

Submitter checklist

  • Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
  • Ensure that the pull request title represents the desired changelog entry
  • Please describe what you did
  • Link to relevant issues in GitHub or Jira
  • Link to relevant pull requests, esp. upstream and downstream changes
  • Ensure you have provided tests that demonstrate the feature works or the issue is fixed

@strangelookingnerd strangelookingnerd requested a review from a team as a code owner January 2, 2026 18:03
@strangelookingnerd strangelookingnerd marked this pull request as draft January 2, 2026 19:08
@strangelookingnerd

This comment was marked as outdated.

Copy link
Member

@jglick jglick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JenkinsStartupException jse = assertThrows(JenkinsStartupException.class, () -> {
is unnecessary given
containsString(
"The eddsa-api plugin is not FIPS compliant and can not be used in a Jenkins configured to run in FIPS-140 mode"));
; can be simplified as per jenkinsci/jenkins-test-harness#1135 (comment) I think

@strangelookingnerd
Copy link
Contributor Author

JenkinsStartupException jse = assertThrows(JenkinsStartupException.class, () -> {

is unnecessary given

containsString(
"The eddsa-api plugin is not FIPS compliant and can not be used in a Jenkins configured to run in FIPS-140 mode"));

; can be simplified as per jenkinsci/jenkins-test-harness#1135 (comment) I think

Addressed in ebd5ab3

@strangelookingnerd strangelookingnerd marked this pull request as ready for review January 2, 2026 19:45
public void testStartupFips() throws Throwable {
rjr.javaOptions("-Xmx128M", "-Djenkins.security.FIPS140.COMPLIANCE=true");
JenkinsStartupException jse = assertThrows(JenkinsStartupException.class, () -> {
IOException jse = assertThrows(IOException.class, () -> {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine, or just do not assert the exception type at all.

IOException jse = assertThrows(IOException.class, () -> {
rjr.then(r -> {
Jenkins.get().getPluginManager().uberClassLoader.loadClass("net.i2p.crypto.eddsa.EdDSAEngine");
fail("should not get here!");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW this is redundant. I think the whole assertion could be something like

assertThat(assertThrows(Throwable.class, () -> rjr.run(r -> r.jenkins.pluginManager.uberClassLoader.loadClass("net.i2p.crypto.eddsa.EdDSAEngine"))).getMessage(),
                containsString(
                        "The eddsa-api plugin is not FIPS compliant and can not be used in a Jenkins configured to run in FIPS-140 mode"));

@jglick
Copy link
Member

jglick commented Jan 2, 2026

Maintainers please remember to apply the developer label before merging!

@timja timja added the developer Changes which impact plugin developers label Jan 5, 2026
@jglick
Copy link
Member

jglick commented Jan 7, 2026

@jtnord I believe you may have write permission here?

@jtnord jtnord merged commit 6ea07be into jenkinsci:master Jan 7, 2026
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

developer Changes which impact plugin developers

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants