From 8d213bba04fa4c5f80d4526c3bc8153f95bedef3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 30 Apr 2025 05:50:05 +0530
Subject: [PATCH] Make test more robust against env

---
 kitty_tests/options.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/kitty_tests/options.py b/kitty_tests/options.py
index f7bfee158..169b8aed1 100644
--- a/kitty_tests/options.py
+++ b/kitty_tests/options.py
@@ -126,8 +126,9 @@ def t(args, leftover=(), fails=False, version_called=False, help_called=False, *
 
 def launcher(self):
     kexe = kitty_exe()
-    cfgdir = os.path.join(os.environ['XDG_CONFIG_HOME'], 'kitty')
+    cfgdir = None
     def get_report(cmdline: str, launch_services= False):
+        nonlocal cfgdir
         args = list(shlex_split(cmdline))
         env = dict(os.environ)
         if launch_services:
@@ -147,6 +148,8 @@ def get_report(cmdline: str, launch_services= False):
             else:
                 val = val.strip()
             ans[key] = val
+            if key == 'config_dir':
+                cfgdir = val
         return ans, cp.stdout.decode().replace('\x1e', ' ')
     def test(cmdline, assertions):
         r, output = get_report(cmdline, launch_services=assertions.get('launched_by_launch_services', '0') != '0')
@@ -156,7 +159,8 @@ def test(cmdline, assertions):
 
     def t(cmdline, **assertions):
         assertions['is_quick_access_terminal'] = '0'
-        assertions['config_dir'] = cfgdir
+        if cfgdir:
+            assertions['config_dir'] = cfgdir
         assertions.setdefault('launched_by_launch_services', '0')
         test(cmdline, assertions)