TEST/UCP: Fix test by adding md index to comparison

guy-ealey-morag · guy-ealey-morag · commit 2e67fc2b9768 · 2026-02-27T15:46:46.000Z
diff --git a/test/gtest/ucp/test_ucp_wireup.cc b/test/gtest/ucp/test_ucp_wireup.cc
@@ -1787,11 +1787,11 @@ class test_ucp_address_v2 : public test_ucp_wireup {
         UCS_STATIC_BITMAP_FOR_EACH_BIT(rsc_index, &context->tl_bitmap) {
             auto wiface = ucp_worker_iface(worker, rsc_index);
 
-            /* Compare resources by device and transport */
-            if ((context->tl_rscs[rsc_index].tl_name_csum ==
+            /* Compare resources by md_index, transport name, and device */
+            if ((context->tl_rscs[rsc_index].md_index == ae->md_index) &&
+                (context->tl_rscs[rsc_index].tl_name_csum ==
                  ae->tl_name_csum) &&
                 uct_iface_is_reachable_v2(wiface->iface, &params)) {
-                EXPECT_EQ(ae->md_index, context->tl_rscs[rsc_index].md_index);
                 return &wiface->attr;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1787,11 +1787,11 @@ class test_ucp_address_v2 : public test_ucp_wireup {`
`1787`	`1787`	`UCS_STATIC_BITMAP_FOR_EACH_BIT(rsc_index, &context->tl_bitmap) {`
`1788`	`1788`	`auto wiface = ucp_worker_iface(worker, rsc_index);`
`1789`	`1789`
`1790`		`- /* Compare resources by device and transport */`
`1791`		`- if ((context->tl_rscs[rsc_index].tl_name_csum ==`
	`1790`	`+ /* Compare resources by md_index, transport name, and device */`
	`1791`	`+ if ((context->tl_rscs[rsc_index].md_index == ae->md_index) &&`
	`1792`	`+ (context->tl_rscs[rsc_index].tl_name_csum ==`
`1792`	`1793`	`ae->tl_name_csum) &&`
`1793`	`1794`	`uct_iface_is_reachable_v2(wiface->iface, &params)) {`
`1794`		`- EXPECT_EQ(ae->md_index, context->tl_rscs[rsc_index].md_index);`
`1795`	`1795`	`return &wiface->attr;`
`1796`	`1796`	`}`
`1797`	`1797`	`}`