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 tests: update disconnected client scheduler tests to avoid blocking into release/1.7.x #20617

Conversation

hc-github-team-nomad-core
Copy link
Contributor

Backport

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

🚨

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:
@tgross
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/nomad/merges: 409 Merge conflict []

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


While working on #20462, I discovered that some of the scheduler tests for disconnected clients making long blocking queries. The tests used testutil.WaitForResult to wait for an evaluation to be written to the state store. The evaluation was never written, but the tests were not correctly returning an error for an empty query. This resulted in the tests blocking for 5s and then continuing anyways.

In practice, the evaluation is never written to the state store as part of the test harness Process method, so this test assertion was meaningless. Remove the broken assertion from the two top-level tests that used it, and upgrade these tests to use shoenig/test in the process. This will save us ~50s per test run (for just the test-groups/quick group)


Overview of commits

Copy link

hashicorp-cla-app bot commented May 16, 2024

CLA assistant check
All committers have signed the 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 have already 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.

@vercel vercel bot temporarily deployed to Preview – nomad May 16, 2024 16:23 Inactive
@vercel vercel bot temporarily deployed to Preview – nomad-storybook-and-ui May 16, 2024 16:25 Inactive
@tgross
Copy link
Member

tgross commented May 16, 2024

Gotta fix this and the 1.6.x backport because these tests assume the new block we added in 1.8.0. Working on that now.

…20615)

While working on #20462, I discovered that some of the scheduler tests for
disconnected clients making long blocking queries. The tests used
`testutil.WaitForResult` to wait for an evaluation to be written to the state
store. The evaluation was never written, but the tests were not correctly
returning an error for an empty query. This resulted in the tests blocking for
5s and then continuing anyways.

In practice, the evaluation is never written to the state store as part of the
test harness `Process` method, so this test assertion was meaningless. Remove
the broken assertion from the two top-level tests that used it, and upgrade
these tests to use `shoenig/test` in the process. This will save us ~50s per
test run.
@tgross tgross force-pushed the backport/test-updates-scheduler-disconnected-clients/infinitely-current-goblin branch from c274ff1 to a3e7b31 Compare May 16, 2024 17:19
@tgross tgross marked this pull request as ready for review May 16, 2024 17:20
@tgross tgross merged commit a12eefb into release/1.7.x May 16, 2024
19 checks passed
@tgross tgross deleted the backport/test-updates-scheduler-disconnected-clients/infinitely-current-goblin branch May 16, 2024 17:38
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.

2 participants