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 mysql test again #13468

Merged
merged 2 commits into from
Nov 8, 2020
Merged

Fix mysql test again #13468

merged 2 commits into from
Nov 8, 2020

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented Nov 8, 2020

There are still intermittent issues with failures in: TestGit/HTTP/BranchProtectMerge/MergePR on mysql and mysql8 despite the request again technique.

This PR attempts to resolve these by recreating the request completely instead of just sending it again.

@zeripath zeripath added this to the 1.14.0 milestone Nov 8, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Nov 8, 2020
silverwind
silverwind approved these changes Nov 8, 2020
View reviewed changes
Copy link
Member

@silverwind silverwind left a comment

Choose a reason for hiding this comment

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

Those failures are very annoying, hope this fixes it 😉

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Nov 8, 2020
@zeripath
Copy link
Contributor Author

zeripath commented Nov 8, 2020

OK I think this seems to work...

@zeripath zeripath merged commit 8ae5548 into go-gitea:master Nov 8, 2020
@zeripath zeripath deleted the fix-mysql-test-again branch November 8, 2020 19:23
@zeripath zeripath added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Nov 8, 2020
@zeripath zeripath mentioned this pull request Nov 9, 2020
Merged
6543 pushed a commit to 6543-forks/gitea that referenced this pull request Nov 9, 2020
@zeripath @6543
2nd attempt at re-request APIMergePullRequest (go-gitea#13468)
a176a8f 
Signed-off-by: Andrew Thornton <[email protected]>
@6543 6543 mentioned this pull request Nov 9, 2020
Merged
@6543 6543 added the backport/done All backports for this PR have been created label Nov 9, 2020
techknowlogick pushed a commit that referenced this pull request Nov 10, 2020
@6543 @zeripath
2nd attempt at re-request APIMergePullRequest (#13468) (#13490)
797cb38 
Signed-off-by: Andrew Thornton <[email protected]>

Co-authored-by: zeripath <[email protected]>
@go-gitea go-gitea locked and limited conversation to collaborators Dec 14, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@6543 6543 6543 approved these changes

@lafriks lafriks lafriks approved these changes

@silverwind silverwind silverwind approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/testing
Projects
None yet
Milestone
1.14.0
Development

Successfully merging this pull request may close these issues.
5 participants
@zeripath @silverwind @lafriks @6543 @GiteaBot