fix: detect storage:exec TTY with isatty, not ModeCharDevice

/dev/null is a character device but not a terminal. Treating it as a TTY
made docker run -it fail under docker exec without -t, which broke the
Dokku-in-Docker storage bats job in CI.
This commit is contained in:
Jose Diaz-Gonzalez committed 2026-10-16 11:52:01 -04:00
1 parent f768eb6d07
commit 3dafdcb3f9
3 files changed
+55 -7

No files matched your search

+45
View File
@@ -1,6 +1,7 @@
package storage
import (
"os"
"path/filepath"
"testing"
@@ -218,3 +219,47 @@ func TestCommandSetPersistsAndValidates(t *testing.T) {
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("does not exist"))
}
// TestStdinModesDevNullIsNotTTY guards the CI / docker-exec path: stdin is
// often /dev/null, which is a character device but not a terminal. ModeCharDevice
// alone would request docker run -it and fail attach.
func TestStdinModesDevNullIsNotTTY(t *testing.T) {
devNull, err := os.Open(os.DevNull)
if err != nil {
t.Fatal(err)
}
defer devNull.Close()
old := os.Stdin
os.Stdin = devNull
t.Cleanup(func() { os.Stdin = old })
interactive, tty := stdinModes()
if tty {
t.Fatalf("expected tty=false for /dev/null, got tty=true interactive=%v", interactive)
}
if interactive {
t.Fatalf("expected interactive=false for /dev/null, got interactive=true")
}
}
func TestStdinModesNamedPipeIsInteractiveWithoutTTY(t *testing.T) {
r, w, err := os.Pipe()
if err != nil {
t.Fatal(err)
}
defer r.Close()
defer w.Close()
old := os.Stdin
os.Stdin = r
t.Cleanup(func() { os.Stdin = old })
interactive, tty := stdinModes()
if tty {
t.Fatalf("expected tty=false for a pipe, got tty=true")
}
if !interactive {
t.Fatalf("expected interactive=true for a named pipe")
}
}