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

[SHIRO-811] fix toggling test through Mockito conversion. #282

Merged
merged 2 commits into from
Jan 25, 2021
Merged

[SHIRO-811] fix toggling test through Mockito conversion. #282

merged 2 commits into from
Jan 25, 2021

Conversation

bmarwell
Copy link
Contributor

@bmarwell bmarwell commented Jan 22, 2021

This PR converts tests from the web project from using EasyMock into Mockito.
The idea is that EasyMock creates mocks which seem unpredictable in a few cases we encounter, leading to flaky tests.

https://issues.apache.org/jira/browse/SHIRO-811


Following this checklist to help us incorporate your contribution quickly and easily:

  • Make sure there is a JIRA issue filed
    for the change (usually before you start working on it). Trivial changes like typos do not
    require a JIRA issue. Your pull request should address just this issue, without pulling in other changes.
  • Each commit in the pull request should have a meaningful subject line and body.
  • Format the pull request title like [SHIRO-XXX] - Fixes bug in SessionManager,
    where you replace SHIRO-XXX with the appropriate JIRA issue. Best practice
    is to use the JIRA issue title in the pull request title and in the first line of the commit message.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Run mvn clean install apache-rat:check to make sure basic checks pass. A more thorough check will be performed on your pull request automatically.
  • If you have a group of commits related to the same change, please squash your commits into one and force push your branch using git rebase -i.

Trivial changes like typos do not require a JIRA issue (javadoc, comments...).
In this case, just format the pull request title like (DOC) - Add javadoc in SessionManager.

If this is your first contribution, you have to read the Contribution Guidelines

If your pull request is about ~20 lines of code you don't need to sign an Individual Contributor License Agreement
if you are unsure please ask on the developers list.

To make clear that you license your contribution under the Apache License Version 2.0, January 2004
you have to acknowledge this by using the following check-box.

@bmarwell
Copy link
Contributor Author

Huh. Maybe there is still some Powermock stuff going around in the background. Wouldn't be the first time we had issues with it. I'll look for other occurrences.

Copy link
Member

@bdemers bdemers left a comment

Choose a reason for hiding this comment

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

🚢

@bmarwell
Copy link
Contributor Author

Hi Brian,
I will not merge this PR as long as there are those toggling test results: https://ci-builds.apache.org/job/Shiro/job/Shiro-all/view/change-requests/job/PR-282/

I just need to have a non-draft PR so I can see the Jenkins output.

By the way, the test never failed on my machine. I cannot even reproduce it.

@bmarwell
Copy link
Contributor Author

Hi @bdemers,
feel free to re-review. I converted some more tests, and now the "flaky test" seems to have gone for good.

@bmarwell bmarwell requested a review from bdemers January 25, 2021 20:00
@asfgit asfgit merged commit e5d8134 into apache:master Jan 25, 2021
@bmarwell bmarwell deleted the SHIRO-811 branch January 25, 2021 20:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants