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

Kotlin migration ModelTest #11665

Merged

Conversation

Prince-kushwaha
Copy link
Contributor

Pull Request template

Purpose / Description

Kotlin Migration of ModelTest

@Prince-kushwaha Prince-kushwaha marked this pull request as draft June 21, 2022 05:38
@Prince-kushwaha Prince-kushwaha force-pushed the kotlint_migration_modelTest branch 4 times, most recently from 2200b4e to 4bbadbb Compare June 21, 2022 15:00
@Prince-kushwaha Prince-kushwaha marked this pull request as ready for review June 21, 2022 15:24
@Prince-kushwaha
Copy link
Contributor Author

@david-allison how i fix below unit test error if i not made change in UpgradeGesturesToControlsTest.kt
Screenshot 2022-06-25 213851

@mikehardy
Copy link
Member

@Prince-kushwaha that failure is a flaky test - it's actually our most common flake at the moment, pretty irritating - hopefully either someone has time to fix it soon or I'll have to disable it in CI #11091 (comment)

Copy link
Member

@lukstbit lukstbit left a comment

Choose a reason for hiding this comment

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

Has conflicts at the moment.

@lukstbit lukstbit added the Needs Author Reply Waiting for a reply from the original author label Jul 7, 2022
@lukstbit lukstbit added Needs Second Approval Has one approval, one more approval to merge and removed Needs Author Reply Waiting for a reply from the original author labels Jul 10, 2022
@mikehardy
Copy link
Member

Oh no, @Prince-kushwaha sorry about this - it appears to have taken a conflict before I had any time to work through the second review queue and get things merged. I'm really sorry about that. Do you have time to fix the conflict?

@mikehardy mikehardy added the Needs Author Reply Waiting for a reply from the original author label Jul 30, 2022
@Prince-kushwaha Prince-kushwaha force-pushed the kotlint_migration_modelTest branch 3 times, most recently from d3e255a to 5e2e53f Compare July 31, 2022 13:32
@Prince-kushwaha
Copy link
Contributor Author

@mikehardy i fixed the conflict

@Arthur-Milchior Arthur-Milchior merged commit 6367833 into ankidroid:main Jul 31, 2022
@github-actions github-actions bot added this to the 2.16 release milestone Jul 31, 2022
@github-actions github-actions bot removed the Needs Author Reply Waiting for a reply from the original author label Jul 31, 2022
@github-actions github-actions bot removed the Needs Second Approval Has one approval, one more approval to merge label Jul 31, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants