This is an automated email from the ASF dual-hosted git repository.
mridulpathak pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new 807c5a019 Improved: Replaced flaky fixed sleep in LuceneTests with a
bounded polling loop (OFBIZ-13516)
807c5a019 is described below
commit 807c5a019872586e7e86a10f7a3c86fb0ff941a6
Author: Mridul Pathak <[email protected]>
AuthorDate: Tue Sep 1 19:39:58 2026 +0530
Improved: Replaced flaky fixed sleep in LuceneTests with a bounded polling
loop (OFBIZ-13516)
LuceneTests.groovy slept a fixed 3 seconds after indexContentTree to let
the indexer catch up before searching, but indexContentTree only enqueues
documents onto a background thread's queue and returns immediately, so the wait
was inherently racy (could fail under a slow/busy run) and wasteful (padded
every run even when indexing finished early). Replaced the fixed sleep with a
bounded polling loop that retries the search until the expected hit appears or
a generous timeout elapses, v [...]
---
.../apache/ofbiz/content/test/LuceneTests.groovy | 40 +++++++++++++---------
1 file changed, 23 insertions(+), 17 deletions(-)
diff --git
a/lucene/src/test/groovy/org/apache/ofbiz/content/test/LuceneTests.groovy
b/lucene/src/test/groovy/org/apache/ofbiz/content/test/LuceneTests.groovy
index 2d5d28ce6..1c3f5ea1d 100644
--- a/lucene/src/test/groovy/org/apache/ofbiz/content/test/LuceneTests.groovy
+++ b/lucene/src/test/groovy/org/apache/ofbiz/content/test/LuceneTests.groovy
@@ -49,35 +49,41 @@ class LuceneTests implements JupiterTestHelper {
assert ServiceUtil.isSuccess(resp) :
ServiceUtil.isError(resp) ? ServiceUtil.getErrorMessage(resp)
: 'Could not init search index'
- try {
- Thread.sleep(3000) // sleep 3 seconds to give enough time to the
indexer to process the entries
- } catch (InterruptedException e) {
- logError("Thread interrupted :${e}")
- }
-
Directory directory = FSDirectory.open(new
File(SearchWorker.getIndexPath('content')).toPath())
- DirectoryReader reader = null
- try {
- reader = DirectoryReader.open(directory)
- } catch (Exception e) {
- throw new AssertionError("Could not open search index:
${directory}" as String)
- }
-
BooleanQuery.Builder combQueryBuilder = new BooleanQuery.Builder()
String queryLine = testParams.queryLine ?: 'hand'
- IndexSearcher searcher = new IndexSearcher(reader)
Analyzer analyzer = new StandardAnalyzer()
-
QueryParser parser = new QueryParser('content', analyzer)
Query query = parser.parse(queryLine)
combQueryBuilder.add(query, BooleanClause.Occur.MUST)
BooleanQuery combQuery = combQueryBuilder.build()
- TopDocs topDocs = searcher.search(combQuery, 10)
+ // indexContentTree only enqueues documents onto the background
DocumentIndexer
+ // thread's queue and returns immediately, so the on-disk index may
still be empty
+ // here. Poll for the expected hit instead of sleeping a fixed
duration, which is
+ // either flaky (too short under a slow/busy CI run) or wastes time on
every run
+ // (too long once indexing is already done).
+ TopDocs topDocs = null
+ long deadline = System.currentTimeMillis() + 10000
+ while ((topDocs == null || topDocs.totalHits.value != 1) &&
System.currentTimeMillis() < deadline) {
+ try {
+ DirectoryReader reader = DirectoryReader.open(directory)
+ try {
+ topDocs = new IndexSearcher(reader).search(combQuery, 10)
+ } finally {
+ reader.close()
+ }
+ } catch (Exception ignored) {
+ // index not created yet by the background indexer thread
+ }
+ if (topDocs == null || topDocs.totalHits.value != 1) {
+ Thread.sleep(200)
+ }
+ }
- assert topDocs.totalHits.value == 1 : 'Only 1 result expected from the
testdata'
+ assert topDocs != null && topDocs.totalHits.value == 1 : 'Only 1
result expected from the testdata'
}
}
