address review feedback

Author: knQzx

Sources/ContainerCommands/Flags+ProgressConfig.swift

@@ -19,16 +19,11 @@ import Foundation
 import TerminalProgress
 
 extension Flags.Progress {
-    /// Resolves `.auto` into `.ansi` or `.plain` based on the terminal.
-    ///
-    /// When the progress type is `.auto`, the terminal file handle is checked
-    /// with `isatty`. If the output is a TTY, `.ansi` is used; otherwise
-    /// `.plain` is selected so that piped or redirected output still shows
-    /// simple line-by-line status text.
-    private func resolvedProgress(terminal: FileHandle = .standardError) -> ProgressType {
+    /// Resolves `.auto` into `.ansi` or `.plain` based on whether stderr is a TTY.
+    private func resolvedProgress() -> ProgressType {
         switch progress {
         case .auto:
-            return isatty(terminal.fileDescriptor) == 1 ? .ansi : .plain
+            return isatty(FileHandle.standardError.fileDescriptor) == 1 ? .ansi : .plain
         case .none, .ansi, .plain:
             return progress
         }

Tests/CLITests/Subcommands/Images/TestCLIProgressAuto.swift

@@ -19,55 +19,52 @@ import Testing
 
 class TestCLIProgressAuto: CLITest {
     @Test func testAutoProgressFallsBackToPlainWhenPiped() throws {
-        do {
-            let (_, _, error, status) = try run(arguments: [
-                "image", "pull",
-                "--progress", "auto",
-                alpine,
-            ])
-            #expect(status == 0, "image pull should succeed, stderr: \(error)")
-            let lines = error.components(separatedBy: .newlines)
-                .filter { !$0.contains("Warning! Running debug build") && !$0.isEmpty }
-            #expect(!lines.isEmpty, "expected plain progress output on stderr when piped")
-            #expect(!error.contains("\u{1B}["), "expected no ANSI escapes in piped output")
-        } catch {
-            Issue.record("failed to test auto progress: \(error)")
-            return
-        }
+        let (_, _, error, status) = try run(arguments: [
+            "image", "pull",
+            "--progress", "auto",
+            alpine,
+        ])
+        #expect(status == 0, "image pull should succeed, stderr: \(error)")
+        let lines = error.components(separatedBy: .newlines)
+            .filter { !$0.contains("Warning! Running debug build") && !$0.isEmpty }
+        #expect(!lines.isEmpty, "expected plain progress output on stderr when piped")
+        #expect(!error.contains("\u{1B}["), "expected no ANSI escapes in piped output")
     }
 
     @Test func testExplicitPlainProgress() throws {
-        do {
-            let (_, _, error, status) = try run(arguments: [
-                "image", "pull",
-                "--progress", "plain",
-                alpine,
-            ])
-            #expect(status == 0, "image pull --progress plain should succeed, stderr: \(error)")
-            let lines = error.components(separatedBy: .newlines)
-                .filter { !$0.contains("Warning! Running debug build") && !$0.isEmpty }
-            #expect(!lines.isEmpty, "expected plain progress output on stderr")
-            #expect(!error.contains("\u{1B}["), "expected no ANSI escapes with --progress plain")
-        } catch {
-            Issue.record("failed to test plain progress: \(error)")
-            return
-        }
+        let (_, _, error, status) = try run(arguments: [
+            "image", "pull",
+            "--progress", "plain",
+            alpine,
+        ])
+        #expect(status == 0, "image pull --progress plain should succeed, stderr: \(error)")
+        let lines = error.components(separatedBy: .newlines)
+            .filter { !$0.contains("Warning! Running debug build") && !$0.isEmpty }
+        #expect(!lines.isEmpty, "expected plain progress output on stderr")
+        #expect(!error.contains("\u{1B}["), "expected no ANSI escapes with --progress plain")
+    }
+
+    @Test func testExplicitAnsiProgress() throws {
+        let (_, _, error, status) = try run(arguments: [
+            "image", "pull",
+            "--progress", "ansi",
+            alpine,
+        ])
+        #expect(status == 0, "image pull --progress ansi should succeed, stderr: \(error)")
+        let lines = error.components(separatedBy: .newlines)
+            .filter { !$0.contains("Warning! Running debug build") && !$0.isEmpty }
+        #expect(!lines.isEmpty, "expected ansi progress output on stderr")
     }
 
     @Test func testNoneProgressSuppressesOutput() throws {
-        do {
-            let (_, _, error, status) = try run(arguments: [
-                "image", "pull",
-                "--progress", "none",
-                alpine,
-            ])
-            #expect(status == 0, "image pull --progress none should succeed, stderr: \(error)")
-            let lines = error.components(separatedBy: .newlines)
-                .filter { !$0.contains("Warning! Running debug build") && !$0.isEmpty }
-            #expect(lines.isEmpty, "expected no progress output on stderr with --progress none")
-        } catch {
-            Issue.record("failed to test none progress: \(error)")
-            return
-        }
+        let (_, _, error, status) = try run(arguments: [
+            "image", "pull",
+            "--progress", "none",
+            alpine,
+        ])
+        #expect(status == 0, "image pull --progress none should succeed, stderr: \(error)")
+        let lines = error.components(separatedBy: .newlines)
+            .filter { !$0.contains("Warning! Running debug build") && !$0.isEmpty }
+        #expect(lines.isEmpty, "expected no progress output on stderr with --progress none")
     }
 }