DHFPROD-8258: Ensure indexes are ready for match tests

Author: ryanjdew

marklogic-data-hub/src/test/ml-modules/root/test/data-hub-test-helper.xqy

@@ -382,8 +382,13 @@ declare function wait-for-indexes($count as xs:unsignedLong) {
   }, ())
   return
     if ($is-indexing) then
-      let $_sleep := xdmp:sleep(5 * $count)
-      return wait-for-indexes($count + 1)
+      try {
+        let $_sleep := xdmp:sleep(5 * $count)
+        return wait-for-indexes($count + 1)
+      } catch ($e) {
+        if ($e/error:code = "XDMP-EXTIME") then ()
+        else xdmp:rethrow()
+      }
     else
       ()
 };

marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/data-services/mastering/previewMatchingActivity/setup.xqy

@@ -10,10 +10,14 @@ import module namespace test = "http://marklogic.com/test" at "/test/test-helper
 hub-test:load-entities($test:__CALLER_FILE__)
 
 ;
-(: Sleep added to give time for trigger that builds the entity-based TDEs. :)
-xdmp:sleep(250);
 
 xquery version "1.0-ml";
 import module namespace hub-test = "http://marklogic.com/data-hub/test" at "/test/data-hub-test-helper.xqy";
 import module namespace test = "http://marklogic.com/test" at "/test/test-helper.xqy";
-hub-test:load-artifacts($test:__CALLER_FILE__);
+hub-test:load-artifacts($test:__CALLER_FILE__)
+
+;
+
+xquery version "1.0-ml";
+import module namespace hub-test = "http://marklogic.com/data-hub/test" at "/test/data-hub-test-helper.xqy";
+hub-test:wait-for-indexes();

marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/data-services/mastering/previewMatchingActivity2/setup.xqy

@@ -31,3 +31,10 @@ return
     (xdmp:default-permissions(), xdmp:permission('data-hub-common', 'read'), xdmp:permission('data-hub-common', 'update')),
     $const:CONTENT-COLL
   )
+
+
+;
+
+xquery version "1.0-ml";
+import module namespace hub-test = "http://marklogic.com/data-hub/test" at "/test/data-hub-test-helper.xqy";
+hub-test:wait-for-indexes();

marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/smart-mastering/entity-matching/structured-property/suite-setup.xqy

@@ -8,3 +8,9 @@ xquery version "1.0-ml";
 import module namespace hub-test = "http://marklogic.com/data-hub/test" at "/test/data-hub-test-helper.xqy";
 import module namespace test = "http://marklogic.com/test" at "/test/test-helper.xqy";
 hub-test:load-artifacts($test:__CALLER_FILE__)
+
+;
+
+xquery version "1.0-ml";
+import module namespace hub-test = "http://marklogic.com/data-hub/test" at "/test/data-hub-test-helper.xqy";
+hub-test:wait-for-indexes()

marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/smart-mastering/lib/masteringTestLib.sjs

@@ -98,30 +98,31 @@ function assertMatchExists(matchSummary, urisOfMatchingDocuments) {
     urisOfMatchingDocuments = [urisOfMatchingDocuments];
   }
 
-  const uriToProcess = matchSummary.URIsToProcess[0];
+  const expectedPrefix = "/com.marklogic.smart-mastering/merged/";
+  const uriToProcess = matchSummary.URIsToProcess.filter((uri) => uri.startsWith(expectedPrefix))[0];
   const actionDetails = matchSummary.actionDetails[uriToProcess];
 
   // Add the input doc
   const expectedUriCount = urisOfMatchingDocuments.length + 1;
 
-  const prettyActionDetailsUris = xdmp.toJsonString(actionDetails.uris);
-  const expectedPrefix = "/com.marklogic.smart-mastering/merged/";
+  const actualUris = actionDetails ? actionDetails.uris : [];
+  const prettyActionDetailsUris = xdmp.toJsonString(actualUris);
 
   let assertions = [
     test.assertTrue(uriToProcess.startsWith(expectedPrefix),
       `Since a merge is expected, the URI to process should start with ${expectedPrefix}; actual URI: ${uriToProcess}`
     ),
-    test.assertEqual(expectedUriCount, actionDetails.uris.length,
+    test.assertEqual(expectedUriCount, actualUris.length,
       `Expected ${expectedUriCount} matching URIs; actual URIs: ${prettyActionDetailsUris}`
     ),
-    test.assertTrue(actionDetails.uris.includes(TEST_DOC_URI), 
+    test.assertTrue(actualUris.includes(TEST_DOC_URI),
       `Expected the test doc ${TEST_DOC_URI} to be in actionDetails.uris; actual URIs: ${prettyActionDetailsUris}`
     )
   ];
 
   urisOfMatchingDocuments.forEach(uri => {
     assertions.push(
-      test.assertTrue(actionDetails.uris.includes(uri), 
+      test.assertTrue(actualUris.includes(uri),
         `Expected actionDetails.uris to include ${uri}; actual URIs: ${prettyActionDetailsUris}`
       )
     );