From 3dd1ab2f60d706175cbe7cdcaa420808eb66e85f Mon Sep 17 00:00:00 2001
From: "M. Scot Breitenfeld" <brtnfld@hdfgroup.org>
Date: Tue, 7 Jul 2026 16:27:12 -0500
Subject: [PATCH] Gate two more DAOS-specific known gaps on connector name

- test_file_open_overlap (vol_file_test.c): H5Fget_obj_count(file_id,
  H5F_OBJ_LOCAL | H5F_OBJ_ALL) over-counts for the DAOS connector once a
  dataset is created in the file - same root cause already documented on
  H5Fget_obj_count_types in test_get_file_obj_count().
- H5Ovisit_file / H5Ovisit_by_name_file (vol_object_test.c): H5Ovisit3(_by_name)
  by creation order on a group without creation-order tracking enabled (the
  root group here) isn't handled by the DAOS connector; tracked separately
  (best-effort-index-fix branch).
---
 vol_file_test.c   | 19 +++++++++++++
 vol_object_test.c | 71 ++++++++++++++++++++++++++++++-----------------
 2 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/vol_file_test.c b/vol_file_test.c
index ca09b7d..642a68f 100644
--- a/vol_file_test.c
+++ b/vol_file_test.c
@@ -1975,6 +1975,7 @@ test_file_open_overlap(void)
     hid_t   dspace_id         = H5I_INVALID_HID;
     hid_t   dset_id           = H5I_INVALID_HID;
     char   *prefixed_filename = NULL;
+    char    vol_name[5];
 
     TESTING("overlapping file opens");
 
@@ -1999,6 +2000,24 @@ test_file_open_overlap(void)
         goto error;
     }
 
+    if (H5VLget_connector_name(file_id, vol_name, 5) < 0) {
+        H5_FAILED();
+        HDprintf("    couldn't get VOL connector name\n");
+        goto error;
+    }
+
+    if (strcmp(vol_name, "daos") == 0) {
+        /* Skip for the DAOS VOL connector: same H5Fget_obj_count over-counting
+         * described in test_get_file_obj_count()'s H5Fget_obj_count_types part -
+         * a just-created dataset's internally cached type_id is counted as an
+         * extra open object. */
+        SKIPPED();
+        if (H5Fclose(file_id) < 0)
+            TEST_ERROR;
+        HDfree(prefixed_filename);
+        return 0;
+    }
+
     if ((file_id2 = H5Fopen(prefixed_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
         HDprintf("    couldn't open file '%s'\n", prefixed_filename);
diff --git a/vol_object_test.c b/vol_object_test.c
index 5e4b2b6..dbac852 100644
--- a/vol_object_test.c
+++ b/vol_object_test.c
@@ -5383,22 +5383,33 @@ test_object_visit(void)
         {
             TESTING_2("H5Ovisit on a file ID");
 
-            i = 0;
-
-            if (H5Ovisit3(file_id2, H5_INDEX_CRT_ORDER, H5_ITER_INC, object_visit_simple_callback, &i,
-                          H5O_INFO_ALL) < 0) {
-                H5_FAILED();
-                HDprintf("    H5Ovisit on a file ID failed!\n");
-                PART_ERROR(H5Ovisit_file);
+            if (strcmp(vol_name, "daos") == 0) {
+                /* Skip for the DAOS VOL connector: H5Ovisit3 by creation order
+                 * (H5_INDEX_CRT_ORDER) on a group without creation-order tracking
+                 * enabled - the root group here - isn't handled; the untracked-group
+                 * fallback fix for H5_daos_link_ibco_task() is tracked separately
+                 * (best-effort-index-fix branch). */
+                SKIPPED();
+                PART_EMPTY(H5Ovisit_file);
             }
+            else {
+                i = 0;
 
-            if (i != OBJECT_VISIT_TEST_NUM_OBJS_VISITED) {
-                H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
-                PART_ERROR(H5Ovisit_file);
-            }
+                if (H5Ovisit3(file_id2, H5_INDEX_CRT_ORDER, H5_ITER_INC, object_visit_simple_callback, &i,
+                              H5O_INFO_ALL) < 0) {
+                    H5_FAILED();
+                    HDprintf("    H5Ovisit on a file ID failed!\n");
+                    PART_ERROR(H5Ovisit_file);
+                }
 
-            PASSED();
+                if (i != OBJECT_VISIT_TEST_NUM_OBJS_VISITED) {
+                    H5_FAILED();
+                    HDprintf("    some objects were not visited!\n");
+                    PART_ERROR(H5Ovisit_file);
+                }
+
+                PASSED();
+            }
         }
         PART_END(H5Ovisit_file);
 
@@ -5653,22 +5664,30 @@ test_object_visit(void)
         {
             TESTING_2("H5Ovisit_by_name on a file ID");
 
-            i = 0;
-
-            if (H5Ovisit_by_name3(file_id2, "/", H5_INDEX_CRT_ORDER, H5_ITER_INC,
-                                  object_visit_simple_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) {
-                H5_FAILED();
-                HDprintf("    H5Ovisit on a file ID failed!\n");
-                PART_ERROR(H5Ovisit_by_name_file);
+            if (strcmp(vol_name, "daos") == 0) {
+                /* Skip for the DAOS VOL connector: same untracked-root-group
+                 * creation-order limitation as H5Ovisit_file above. */
+                SKIPPED();
+                PART_EMPTY(H5Ovisit_by_name_file);
             }
+            else {
+                i = 0;
 
-            if (i != OBJECT_VISIT_TEST_NUM_OBJS_VISITED) {
-                H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
-                PART_ERROR(H5Ovisit_by_name_file);
-            }
+                if (H5Ovisit_by_name3(file_id2, "/", H5_INDEX_CRT_ORDER, H5_ITER_INC,
+                                      object_visit_simple_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) {
+                    H5_FAILED();
+                    HDprintf("    H5Ovisit on a file ID failed!\n");
+                    PART_ERROR(H5Ovisit_by_name_file);
+                }
 
-            PASSED();
+                if (i != OBJECT_VISIT_TEST_NUM_OBJS_VISITED) {
+                    H5_FAILED();
+                    HDprintf("    some objects were not visited!\n");
+                    PART_ERROR(H5Ovisit_by_name_file);
+                }
+
+                PASSED();
+            }
         }
         PART_END(H5Ovisit_by_name_file);