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

[7.x] fix flaky test (backport #5574) #5580

Merged
merged 2 commits into from
Jun 30, 2021
Merged

[7.x] fix flaky test (backport #5574) #5580

merged 2 commits into from
Jun 30, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 29, 2021

This is an automatic backport of pull request #5574 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

use same ctx.WithTimeout in server and request.
previously we were using a separate ctx.

fixes #5571

(cherry picked from commit 846116b)
@stuartnelson3 stuartnelson3 enabled auto-merge (squash) June 29, 2021 20:34
@apmmachine
Copy link
Contributor

apmmachine commented Jun 29, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #5580 updated

  • Start Time: 2021-06-29T21:25:25.800+0000

  • Duration: 36 min 43 sec

  • Commit: 7571bd7

Test stats 🧪

Test Results
Failed 0
Passed 4658
Skipped 108
Total 4766

Trends 🧪

Image of Build Times

Image of Tests

@stuartnelson3 stuartnelson3 disabled auto-merge June 29, 2021 21:27
@axw axw merged commit fdb2c62 into 7.x Jun 30, 2021
@axw axw deleted the mergify/bp/7.x/pr-5574 branch June 30, 2021 01:25
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.

3 participants