DHFPROD-8258: Add more test indexing waits

Author: ryanjdew

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

@@ -373,7 +373,12 @@ declare function run-with-roles-and-privileges($roles, $privileges, $func-or-mod
 
 declare function wait-for-indexes()
 {
-  wait-for-indexes(1)
+  try {
+    wait-for-indexes(1)
+  } catch ($e) {
+    if ($e/error:code = "XDMP-EXTIME") then ()
+    else xdmp:rethrow()
+  }
 };
 
 declare function wait-for-indexes($count as xs:unsignedLong) {
@@ -382,13 +387,8 @@ declare function wait-for-indexes($count as xs:unsignedLong) {
   }, ())
   return
     if ($is-indexing) then
-      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()
-      }
+      let $_sleep := xdmp:sleep(5 * $count)
+      return wait-for-indexes($count + 1)
     else
       ()
 };

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

@@ -3,3 +3,7 @@ import module namespace hub-test = "http://marklogic.com/data-hub/test" at "/tes
 import module namespace test = "http://marklogic.com/test" at "/test/test-helper.xqy";
 hub-test:reset-hub(),
 hub-test:load-jobs($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/entity-matching/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/entity-matching/structured-property/suite-setup.xqy

@@ -14,3 +14,9 @@ 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()
+
+;
+
+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();