Skip to content

Backport of Fix various flaky tests into release/1.14.x#17291

Closed
hc-github-team-consul-core wants to merge 1 commit intorelease/1.14.xfrom
backport/kisunji/fix-flakes/formally-giving-goldfish
Closed

Backport of Fix various flaky tests into release/1.14.x#17291
hc-github-team-consul-core wants to merge 1 commit intorelease/1.14.xfrom
backport/kisunji/fix-flakes/formally-giving-goldfish

Conversation

@hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #16396 to be assessed for backporting due to the inclusion of the label backport/1.14.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@kisunji
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Fixes tests that have high rates of failure in our CI pipeline:

  • TestStreamResources_Server_DisconnectsOnHeartbeatTimeout/stream_is_disconnected_due_to_heartbeat_timeout
  • TestDebugCommand_DebugDisabled
  • TestServer_DeltaAggregatedResources_v3_ACLEnforcement (added retries but not 100% confident in fix)

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/kisunji/fix-flakes/formally-giving-goldfish branch 2 times, most recently from ba66eba to ef4cde6 Compare May 10, 2023 16:02
@hashicorp-cla
Copy link

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@kisunji kisunji closed this May 10, 2023
@github-actions github-actions bot deleted the backport/kisunji/fix-flakes/formally-giving-goldfish branch August 29, 2025 06:20
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