From cdc7e64a6fd7ff3ebcf8f10ac973e493a490ff68 Mon Sep 17 00:00:00 2001
From: ldematte <lorenzo.dematte@elastic.co>
Date: Mon, 17 Nov 2025 10:25:35 +0100
Subject: [PATCH] FIX: return builtin CuVSProvider when mock is null in
 internalClusterTests

---
 .../org/elasticsearch/plugin/gpu/TestCuVSServiceProvider.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/x-pack/plugin/gpu/src/internalClusterTest/java/org/elasticsearch/plugin/gpu/TestCuVSServiceProvider.java b/x-pack/plugin/gpu/src/internalClusterTest/java/org/elasticsearch/plugin/gpu/TestCuVSServiceProvider.java
index fa386bffbe3cb..efa95608c8266 100644
--- a/x-pack/plugin/gpu/src/internalClusterTest/java/org/elasticsearch/plugin/gpu/TestCuVSServiceProvider.java
+++ b/x-pack/plugin/gpu/src/internalClusterTest/java/org/elasticsearch/plugin/gpu/TestCuVSServiceProvider.java
@@ -25,6 +25,9 @@ public class TestCuVSServiceProvider extends CuVSServiceProvider {
 
     @Override
     public CuVSProvider get(CuVSProvider builtin) {
+        if (mockedGPUInfoProvider == null) {
+            return builtin;
+        }
         return new CuVSProviderDelegate(builtin) {
             @Override
             public GPUInfoProvider gpuInfoProvider() {