From 9b989f8d3fac6cb5cd0031b40ad2501669f32624 Mon Sep 17 00:00:00 2001
From: jwhur <57657645+JaewonHur@users.noreply.github.com>
Date: Fri, 6 Mar 2026 16:42:12 -0800
Subject: [PATCH] Tolerate container-builder-shim check fail (#1297)

- Previously we weren't tolerating a throw from
  the check.
- We have #1250 open for root cause analysis of
  this particular throw that trips the test up.
---
 Tests/CLITests/Subcommands/Build/CLIBuildBase.swift | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Tests/CLITests/Subcommands/Build/CLIBuildBase.swift b/Tests/CLITests/Subcommands/Build/CLIBuildBase.swift
index eb5ec30c..b8f71179 100644
--- a/Tests/CLITests/Subcommands/Build/CLIBuildBase.swift
+++ b/Tests/CLITests/Subcommands/Build/CLIBuildBase.swift
@@ -45,10 +45,14 @@ class TestCLIBuildBase: CLITest {
         var attempt = 3
         while attempt > 0 {
             attempt -= 1
-            let response = try doExec(name: buildkitName, cmd: ["pidof", "-s", "container-builder-shim"])
-            if !response.isEmpty {
-                // found the init process running
-                return
+            do {
+                let response = try doExec(name: buildkitName, cmd: ["pidof", "-s", "container-builder-shim"])
+                if !response.isEmpty {
+                    // found the init process running
+                    return
+                }
+            } catch {
+                print("container-builder-shim check failed with \(error)")
             }
             sleep(1)
         }