From d1223b189d145d174c131a200f4f6bb7978a1993 Mon Sep 17 00:00:00 2001
From: Roland Walker <walker@pobox.com>
Date: Sat, 6 Jun 2026 08:18:58 -0400
Subject: [PATCH] skip flaky external-editor test in CI

This test often fails, which is unhelpful.

Incidentally move an item in the changelog.
---
 changelog.md                     | 4 +++-
 pyproject.toml                   | 3 ++-
 test/features/environment.py     | 3 +++
 test/features/iocommands.feature | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/changelog.md b/changelog.md
index 37e6c218..33506813 100644
--- a/changelog.md
+++ b/changelog.md
@@ -5,11 +5,13 @@ Features
 --------
 * Detect Apache Doris and display its real version instead of the MySQL-compat placeholder.
 
+
 Bug Fixes
 ---------
 * Keep completion-menu Escape cancellation eager only in Vi mode so Emacs Alt-key bindings keep working while completions are open.
 * Keep identifiers that start with `set` highlighted as names.
 * Fix version display for MySQL distributions that return a plain `X.Y.Z` version string with no suffix (e.g. Homebrew MySQL).
+* Speed up startup by skipping LLM imports when `MYCLI_LLM_OFF` is set.
 
 
 Internal
@@ -20,7 +22,7 @@ Internal
 * Add CI on macOS.
 * Add limited CI on Windows.
 * Add limited CI on Windows WSL.
-* Speed up startup by skipping LLM imports when `MYCLI_LLM_OFF` is set.
+* Skip flaky external-editor test in CI.
 
 
 1.73.1 (2026/05/29)
diff --git a/pyproject.toml b/pyproject.toml
index 4a1be0fc..22d870b4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -136,7 +136,8 @@ passenv = ['PYTEST_HOST',
            'PYTEST_USER',
            'PYTEST_PASSWORD',
            'PYTEST_PORT',
-           'PYTEST_CHARSET']
+           'PYTEST_CHARSET',
+           'GITHUB_ACTION']
 commands = [['uv', 'pip', 'install', '-e', '.[dev,ssh,llm]'],
             ['coverage', 'run', '-m', 'pytest', '-v', 'test'],
             ['coverage', 'report', '-m', '--sort=Miss'],
diff --git a/test/features/environment.py b/test/features/environment.py
index 0448fc24..04b2f1ff 100644
--- a/test/features/environment.py
+++ b/test/features/environment.py
@@ -105,6 +105,9 @@ def before_scenario(context, arg):
     # Skip scenarios marked skip_py312 when running on Python 3.12
     if sys.version_info[:2] == (3, 12) and "skip_py312" in arg.tags:
         arg.skip("Skipped on Python 3.12")
+    # Skip flaky editor test in CI
+    if os.getenv('GITHUB_ACTION') and 'skip_ci' in arg.tags:
+        arg.skip('Skipped in CI')
     with open(test_log_file, "w") as f:
         f.write("")
     if arg.location.filename not in SELF_CONNECTING_FEATURES:
diff --git a/test/features/iocommands.feature b/test/features/iocommands.feature
index 3a523c39..9095faf2 100644
--- a/test/features/iocommands.feature
+++ b/test/features/iocommands.feature
@@ -1,5 +1,6 @@
 Feature: I/O commands
 
+  @skip_ci
   Scenario: edit sql in file with external editor
      When we start external editor providing a file name
       and we type "select * from abc" in the editor