ayo/kitty
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add mock for failing test

Browse source
This commit is contained in:
Kovid Goyal 2025-01-05 20:36:32 +05:30
parent 2d02ff1c5f
commit 86a6685446
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
kittens/ssh/utils_test.go
View file

@ -9,6 +9,7 @@ import (
"path/filepath"
"testing"
"kitty/tools/config"
"kitty/tools/utils/shlex"
"github.com/google/go-cmp/cmp"
@ -66,8 +67,10 @@ func TestParseSSHArgs(t *testing.T) {
func TestRelevantKittyOpts(t *testing.T) {
tdir := t.TempDir()
path := filepath.Join(tdir, "kitty.conf")
config.OverrideEffectiveConfigPath = path
defer func() { config.OverrideEffectiveConfigPath = "" }()
os.WriteFile(path, []byte("term XXX\nshell_integration changed\nterm abcd"), 0o600)
rko := read_relevant_kitty_opts(path)
rko := read_relevant_kitty_opts()
if rko.Term != "abcd" {
t.Fatalf("Unexpected TERM: %s", RelevantKittyOpts().Term)
}

6
tools/config/api.go
View file

@ -401,10 +401,12 @@ func ReloadConfigInKitty(in_parent_only bool) error {
return nil
}
var OverrideEffectiveConfigPath string
func ReadKittyConfig(line_handler func(key, val string) error) error {
kitty_conf_path := ""
kp := os.Getenv("KITTY_PID")
if _, err := strconv.Atoi(kp); err == nil {
kitty_conf_path := OverrideEffectiveConfigPath
if _, err := strconv.Atoi(kp); err == nil && kitty_conf_path == "" {
effective_config_path := filepath.Join(utils.CacheDir(), "effective-config", kp)
if unix.Access(effective_config_path, unix.R_OK) == nil {
kitty_conf_path = effective_config_path