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

Backport of Don't send updates twice into release/1.15.x #17029

Conversation

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

Backport

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

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


Fix test race condition causing test flake.

=== RUN   TestManager_SendUpdate
panic: Fail in goroutine after TestManager_Run has completed

exec: go version
goroutine 35 [running]:
testing.(*common).Fail(0xc000484680)
	/home/runner/actions-runner/_work/_tool/go/1.20.3/x64/src/testing/testing.go:933 +0xe5
testing.(*common).Errorf(0xc000484680, {0xc59347?, 0x40fd08?}, {0xc00049cac0?, 0x18?, 0x18?})
	/home/runner/actions-runner/_work/_tool/go/1.20.3/x64/src/testing/testing.go:1050 +0x65
github.com/stretchr/testify/mock.(*Mock).fail(0xc0004ae140, {0xc59347?, 0x4?}, {0xc00049cac0?, 0x2?, 0x2?})
	/home/runner/go/pkg/mod/github.com/stretchr/[email protected]/mock/mock.go:330 +0xeb
github.com/stretchr/testify/mock.(*Mock).MethodCalled(0xc0004ae140, {0xe1cbd3, 0x10}, {0xc00061a000, 0x2, 0x2})
	/home/runner/go/pkg/mod/github.com/stretchr/[email protected]/mock/mock.go:472 +0x2ac
github.com/stretchr/testify/mock.(*Mock).Called(0x7fc7b1f76878?, {0xc00061a000, 0x2, 0x2})
	/home/runner/go/pkg/mod/github.com/stretchr/[email protected]/mock/mock.go:456 +0x148
github.com/hashicorp/consul/agent/hcp.(*MockClient).PushServerStatus(0xc0004ae140, {0xd338e8?, 0xc000610000}, 0xc000618000)
	/home/runner/actions-runner/_work/consul-enterprise/consul-enterprise/agent/hcp/mock_Client.go:118 +0xe5
github.com/hashicorp/consul/agent/hcp.(*Manager).sendUpdate(0xc0004a2a10)
	/home/runner/actions-runner/_work/consul-enterprise/consul-enterprise/agent/hcp/manager.go:179 +0x405
github.com/hashicorp/consul/agent/hcp.(*Manager).Run(0xc0004a2a10, {0xd33878, 0xc0004ae190})
	/home/runner/actions-runner/_work/consul-enterprise/consul-enterprise/agent/hcp/manager.go:110 +0x3c8
created by github.com/hashicorp/consul/agent/hcp.TestManager_Run
	/home/runner/actions-runner/_work/consul-enterprise/consul-enterprise/agent/hcp/manager_test.go:33 +0x4cf
FAIL agent/hcp.TestManager_SendUpdate (-1.00s)

https://github.com/hashicorp/consul-enterprise/actions/runs/4694345380/jobs/8322458432?pr=5112


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/lkysow/test-fix/globally-warm-porpoise branch from df8df9b to 48e9577 Compare April 18, 2023 17:42
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/lkysow/test-fix/globally-warm-porpoise branch from 66d53cf to 27bfe61 Compare April 18, 2023 17:42
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

@hc-github-team-consul-core hc-github-team-consul-core merged commit ac96ab8 into release/1.15.x Apr 18, 2023
@hc-github-team-consul-core hc-github-team-consul-core deleted the backport/lkysow/test-fix/globally-warm-porpoise branch April 18, 2023 18:00
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