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

Jump to bottom

Fix various test bugs seen when running on Windows #6029

Merged
merged 6 commits into from
Dec 15, 2021
Merged

Fix various test bugs seen when running on Windows #6029

merged 6 commits into from
Dec 15, 2021

Conversation

basil
Copy link
Member

@basil basil commented Dec 8, 2021

Fixes various minor bugs discovered in tests while running on Windows.

Proposed changelog entries

N/A

Proposed upgrade guidelines

N/A

Submitter checklist

  • (If applicable) Jira issue is well described
  • Changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developer, depending on the change). Examples
    • Fill-in the Proposed changelog entries section only if there are breaking changes or other changes which may require extra steps from users during the upgrade
  • Appropriate autotests or explanation to why this change has no tests
  • For dependency updates: links to external changelogs and, if possible, full diffs

Desired reviewers

@mention

Maintainer checklist

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

  • There are at least 2 approvals for the pull request and no outstanding requests for change
  • Conversations in the pull request are over OR it is explicit that a reviewer does not block the change
  • Changelog entries in the PR title and/or Proposed changelog entries are correct
  • Proper changelog labels are set so that the changelog can be generated automatically
  • If the change needs additional upgrade steps from users, upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the PR title. (example)
  • If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).

@basil basil added the skip-changelog Should not be shown in the changelog label Dec 8, 2021
basil
basil commented Dec 8, 2021
View reviewed changes
test/src/test/java/hudson/PluginManagerTest.java
@@ -194,7 +194,7 @@ public void startPlugin(PluginWrapper plugin) throws Exception {
// plugins should be already visible in the UberClassLoader
assertFalse(activePlugins.isEmpty());

uberClassLoader.loadClass("hudson.plugins.tasks.Messages");
assertNotNull(uberClassLoader.loadClass("htmlpublisher.HtmlPublisher"));
Copy link
Member Author

Choose a reason for hiding this comment

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

I unintentionally broke this test in commit 1b2ca8a by switching from tasks.jpi to htmlpublisher.jpi without updating the corresponding class name, but we never noticed because the return value is ignored. I fixed the return value problem by asserting that the value is not null, which would have exposed the original problem in the first place.

test/src/test/java/jenkins/security/stapler/Security914Test.java
@@ -45,12 +46,11 @@
public JenkinsRule j = new JenkinsRule();

@Test
@WithPlugin("credentials.hpi")
Copy link
Member Author

Choose a reason for hiding this comment

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

We no longer bundle credentials as a detached plugin as of commit commit c6f061f, which this test wanted. Fortunately, there's a credentials.hpi in the source tree, so we can get the same effect with a @WithPlugin annotation.

@basil basil force-pushed the windows-tests branch 3 times, most recently from 6b716c9 to d48d70d Compare December 8, 2021 03:23
@basil basil added the squash-merge-me Unclean or useless commit history, should be merged only with squash-merge label Dec 8, 2021
@basil basil requested a review from a team December 8, 2021 17:57
@timja timja requested a review from jtnord December 8, 2021 18:44
@basil basil mentioned this pull request Dec 8, 2021
Merged
@basil
Copy link
Member Author

basil commented Dec 8, 2021

This PR was tested successfully in a passing Windows CI run in #6024.

@basil basil requested a review from a team December 11, 2021 23:27
@timja timja added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Dec 14, 2021
@timja
Copy link
Member

timja commented Dec 14, 2021

This PR is now ready for merge, after ~24 hours, we will merge it if there's no negative feedback.

Thanks!

@basil basil merged commit 960925f into jenkinsci:master Dec 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtnord jtnord jtnord approved these changes

@timja timja timja approved these changes

Assignees
No one assigned
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 squash-merge-me Unclean or useless commit history, should be merged only with squash-merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@basil @timja @jtnord