Fixes #34954: make the glossary hierarchy search IT independent of other tests

[sonika-shah]

Describe your changes:

Fixes #34954

Test-only fix for a flaky IT added in #35221. GlossaryTermResourceIT.test_hierarchySearchKeepsParentOfEveryMatchOnThePage fails in the merge queue's parallel lane:

Condition with alias 'all matching terms should be indexed' didn't complete within 1 minutes … expected: <30> but was: <33>

Why: it waited for search(word) to return exactly 30 hits across the whole shared index. Glossary search matches fuzzily and on name.ngram (3–20 grams), so other tests' terms counted too. Its page and child-count assertions had the same exposure, and it never cleaned up.

What changed (test only, no production code):

• No wait, no global count. Entity create indexes synchronously with Refresh.True (SearchIndexHandler.isAsync() is false), so the terms are searchable when create returns.
• Every search is scoped to the test's own glossary via post_filter on glossary.name.keyword.
• The search word shares no letters with any generated name, so parents can never match it or take a page slot from a match.
• Shared search settings: both tests hold @ResourceLock(SEARCH_SETTINGS, READ), so they never overlap a test that rewrites search settings under the READ_WRITE lock.
• Cleanup: the glossary is hard-deleted recursively in finally, best-effort, so a cleanup hiccup cannot fail a passing test.
• Adds the same check for matches nested 4 levels deep (test_hierarchySearchKeepsFullPathOfDeeplyNestedMatches).

Type of change:

• Bug fix

Tests:

• Both hierarchy tests pass, and the whole GlossaryTermResourceIT class run concurrently passes (308 run, 0 failures) on MySQL + Elasticsearch 9.3.

Why each assertion is now independent of other tests

Risk	Handling
Other tests' terms in the shared index	post_filter on the test's glossary; Elasticsearch applies it before the top-N cut
Search not caught up	Create indexes inline post-commit with Refresh.True; nothing to wait for
Term not yet Approved	initialEntityStatus is Approved when there are no reviewers; the test glossary has none
A parent taking a page slot	The word's letters (jknoqstuvwxyz) never occur in the hex/hier_* names, so no n-gram can match, even fuzzily; parents score 0
Which 25 of the 30 matches return	Irrelevant: all 30 sit under the same parent
Another test rewriting search settings mid-run	@ResourceLock(SEARCH_SETTINGS, READ); writers hold READ_WRITE, and SystemResourceIT / @Isolated writers never run alongside
Leftover data / cleanup failure	Recursive hard delete in finally, best-effort

[gitar-bot]

Code Review ✅ Approved

🟢 Low risk · The changes are confined to integration tests, improving hierarchy-search isolation and cleanup without altering production behavior.

Test-only fix for the flaky GlossaryTermResourceIT hierarchy search tests, scoping every search to the test's own glossary, avoiding a global count wait, and hard-deleting the glossary in finally. No issues found.

Verification

Rules No rules evaluated

Functional validation Not enabled

Set up

Auto-approval Not enabled

Set up

Options

Display: compact → Counting what did not apply, without listing it.

Comment with these commands to change the behavior for this request:

Compact

gitar display:verbose

_{Was this helpful? React with 👍 / 👎 | Powered by Gitar — free for open source}