Skip to content

[9.1] (backport #11539) Ensure we don't report output status in tests where it's irrelevant #11566

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
Closed
wants to merge 1 commit into from
Closed

[9.1] (backport #11539) Ensure we don't report output status in tests where it's irrelevant #11566

wants to merge 1 commit into from
+512 −0

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 3, 2025

What does this PR do?

In some tests, we use a nonexistent ES host to avoid needing to use a remote. Output health reporting actually works for beats receivers, so this can lead to flakiness due to components reporting a degraded state. Disable the status reporting where it's irrelevant to the test.

This takes care of remaining tests that I missed in #11257.

Why is it important?

Tests shouldn't randomly fail because the output correctly reports a degraded status. Example failure: https://buildkite.com/elastic/elastic-agent/builds/31319/steps/table?jid=019adfc5-7d8c-4a2a-a437-5cb33fe32bcb.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files
  • [ ] I have added tests that prove my fix is effective or that my feature works
  • [ ] I have added an entry in ./changelog/fragments using the changelog tool
  • [ ] I have added an integration test or an E2E test
This is an automatic backport of pull request #11539 done by [Mergify](https://mergify.com).

@swiatekm @mergify
Ensure we don't report output status in tests where it's irrelevant (#…
517bb00 
…11539)

* Ensure we don't report output status in tests where it's irrelevant

* Extract common parameters in TestBeatDiagnostics

(cherry picked from commit b8a142f)

# Conflicts:
#	testing/integration/ess/beat_receivers_test.go
#	testing/integration/ess/diagnostics_test.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 3, 2025
@mergify mergify bot requested a review from a team as a code owner December 3, 2025 16:26
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Dec 3, 2025
@mergify mergify bot requested review from blakerouse and swiatekm and removed request for a team December 3, 2025 16:26
@mergify mergify bot added the backport label Dec 3, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Dec 3, 2025

Cherry-pick of b8a142f has failed:

On branch mergify/bp/9.1/pr-11539
Your branch is up to date with 'origin/9.1'.

You are currently cherry-picking commit b8a142f54.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   testing/integration/ess/beat_receivers_test.go
	both modified:   testing/integration/ess/diagnostics_test.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Dec 3, 2025
Merged
3 tasks
@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team flaky-test Unstable or unreliable test cases. skip-changelog chore Tasks that just need to be done, they are neither bug, nor enhancements labels Dec 3, 2025
@elasticmachine
Copy link
Contributor

elasticmachine commented Dec 3, 2025

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@elasticmachine
Copy link
Contributor

elasticmachine commented Dec 3, 2025 •
edited
Loading

💔 Build Failed

Failed CI Steps

History

cc @swiatekm

@swiatekm swiatekm closed this Dec 3, 2025
@mergify mergify bot deleted the mergify/bp/9.1/pr-11539 branch December 3, 2025 16:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@blakerouse blakerouse Awaiting requested review from blakerouse blakerouse is a code owner automatically assigned from elastic/elastic-agent-control-plane

@swiatekm swiatekm Awaiting requested review from swiatekm swiatekm is a code owner automatically assigned from elastic/elastic-agent-control-plane

Assignees

@swiatekm swiatekm

Labels

backport chore Tasks that just need to be done, they are neither bug, nor enhancements conflicts There is a conflict in the backported pull request flaky-test Unstable or unreliable test cases. skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@elasticmachine @swiatekm