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.

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

Basic ProxyConfigurationManagerTest #8952

Merged
merged 1 commit into from
Feb 14, 2024

Conversation

jglick
Copy link
Member

@jglick jglick commented Feb 12, 2024

Came across #8693 and noticed that the XML serial form of ProxyConfiguration was not tested. This is not trivial as can be seen from

public static XmlFile getXmlFile() {
return new XmlFile(XSTREAM, new File(Jenkins.get().getRootDir(), "proxy.xml"));
}
public static ProxyConfiguration load() throws IOException {
XmlFile f = getXmlFile();
if (f.exists())
return (ProxyConfiguration) f.read();
else
return null;
}
private static final XStream XSTREAM = new XStream2();
private static final long serialVersionUID = 1L;
static {
XSTREAM.alias("proxy", ProxyConfiguration.class);
}

(There is also a getter & setter in Jenkins from #3935 which is tested downstream in configuration-as-code-plugin: ProxyConfiguratorTest.)

Testing done

Test passes locally.

Proposed changelog entries

  • N/A

Before the changes are marked as ready-for-merge:

Maintainer checklist

@NotMyFault NotMyFault added the skip-changelog Should not be shown in the changelog label Feb 13, 2024
Copy link
Member

@NotMyFault NotMyFault left a comment

Choose a reason for hiding this comment

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

/label ready-for-merge


This PR is now ready for merge. We will merge it after ~24 hours if there is no negative feedback.
Please see the merge process documentation for more information about the merge process.
Thanks!

@comment-ops-bot comment-ops-bot bot added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Feb 13, 2024
@MarkEWaite MarkEWaite merged commit 091db50 into jenkinsci:master Feb 14, 2024
16 checks passed
@jglick jglick deleted the ProxyConfigurationManagerTest branch February 15, 2024 11:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback skip-changelog Should not be shown in the changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants