dbcli · rolandwalker · Mar 25, 2026 · Mar 24, 2026
diff --git a/changelog.md b/changelog.md
@@ -17,6 +17,7 @@ Internal
 * Collect CLI arguments into a dataclass.
 * Clean up generated files after test runs.
 * Migrate toplevel tool configurations to `pyproject.toml`.
+* Gather `pytest` files into a subdirectory, separated from `behave` tests.
 
 
 1.66.0 (2026/03/21)

diff --git a/test/conftest.py → test/pytests/conftest.py b/test/conftest.py → test/pytests/conftest.py
diff --git a/test/test_clistyle.py → test/pytests/test_clistyle.py b/test/test_clistyle.py → test/pytests/test_clistyle.py
diff --git a/test/test_clitoolbar.py → test/pytests/test_clitoolbar.py b/test/test_clitoolbar.py → test/pytests/test_clitoolbar.py
diff --git a/test/test_completion_engine.py → test/pytests/test_completion_engine.py b/test/test_completion_engine.py → test/pytests/test_completion_engine.py
diff --git a/test/test_completion_refresher.py → test/pytests/test_completion_refresher.py b/test/test_completion_refresher.py → test/pytests/test_completion_refresher.py
diff --git a/test/test_config.py → test/pytests/test_config.py b/test/test_config.py → test/pytests/test_config.py
@@ -20,7 +20,7 @@
 )
 from test.utils import TEMPFILE_PREFIX
 
-LOGIN_PATH_FILE = os.path.abspath(os.path.join(os.path.dirname(__file__), "mylogin.cnf"))
+LOGIN_PATH_FILE = os.path.abspath(os.path.join(os.path.dirname(__file__), "../mylogin.cnf"))
 
 
 def open_bmylogin_cnf(name):

diff --git a/test/test_dbspecial.py → test/pytests/test_dbspecial.py b/test/test_dbspecial.py → test/pytests/test_dbspecial.py
@@ -5,7 +5,7 @@
 from mycli.packages.completion_engine import suggest_type
 from mycli.packages.special.dbcommands import list_tables
 from mycli.packages.special.utils import format_uptime
-from test.test_completion_engine import sorted_dicts
+from test.pytests.test_completion_engine import sorted_dicts
 
 
 def test_list_tables_verbose_preserves_field_results():

diff --git a/test/test_llm_special.py → test/pytests/test_llm_special.py b/test/test_llm_special.py → test/pytests/test_llm_special.py
diff --git a/test/test_main.py → test/pytests/test_main.py b/test/test_main.py → test/pytests/test_main.py
@@ -28,10 +28,10 @@
 from mycli.sqlexecute import ServerInfo, SQLExecute
 from test.utils import DATABASE, HOST, PASSWORD, PORT, TEMPFILE_PREFIX, USER, dbtest, run
 
-test_dir = os.path.abspath(os.path.dirname(__file__))
-project_dir = os.path.dirname(test_dir)
-default_config_file = os.path.join(project_dir, "test", "myclirc")
-login_path_file = os.path.join(test_dir, "mylogin.cnf")
+pytests_dir = os.path.abspath(os.path.dirname(__file__))
+project_root_dir = os.path.abspath(os.path.join(pytests_dir, '..', '..'))
+default_config_file = os.path.join(project_root_dir, 'test', 'myclirc')
+login_path_file = os.path.join(project_root_dir, 'test', 'mylogin.cnf')
 
 os.environ["MYSQL_TEST_LOGIN_FILE"] = login_path_file
 CLI_ARGS = [

diff --git a/test/test_naive_completion.py → test/pytests/test_naive_completion.py b/test/test_naive_completion.py → test/pytests/test_naive_completion.py
diff --git a/test/test_parseutils.py → test/pytests/test_parseutils.py b/test/test_parseutils.py → test/pytests/test_parseutils.py
diff --git a/test/test_prompt_utils.py → test/pytests/test_prompt_utils.py b/test/test_prompt_utils.py → test/pytests/test_prompt_utils.py
diff --git a/...st_smart_completion_public_schema_only.py → ...st_smart_completion_public_schema_only.py b/...st_smart_completion_public_schema_only.py → ...st_smart_completion_public_schema_only.py
diff --git a/test/test_special_iocommands.py → test/pytests/test_special_iocommands.py b/test/test_special_iocommands.py → test/pytests/test_special_iocommands.py
diff --git a/test/test_sqlexecute.py → test/pytests/test_sqlexecute.py b/test/test_sqlexecute.py → test/pytests/test_sqlexecute.py
@@ -323,10 +323,8 @@ def test_system_command_not_found(executor):
 @dbtest
 def test_system_command_output(executor):
     eol = os.linesep
-    test_dir = os.path.abspath(os.path.dirname(__file__))
-    test_file_path = os.path.join(test_dir, "test.txt")
-    results = run(executor, f"system cat {test_file_path}")
-    assert_result_equal(results, preamble=f"mycli rocks!{eol}")
+    results = run(executor, "system echo mycli rocks")
+    assert_result_equal(results, preamble=f"mycli rocks{eol}")
 
 
 @dbtest

diff --git a/test/test_tabular_output.py → test/pytests/test_tabular_output.py b/test/test_tabular_output.py → test/pytests/test_tabular_output.py
@@ -13,7 +13,7 @@
 from mycli.packages.sqlresult import SQLResult
 from test.utils import HOST, PASSWORD, PORT, USER, dbtest
 
-default_config_file = os.path.join(os.path.dirname(__file__), "myclirc")
+default_config_file = os.path.join(os.path.dirname(__file__), "../myclirc")
 
 
 @pytest.fixture

diff --git a/test/test.txt b/test/test.txt
diff --git a/test/test_plan.wiki b/test/test_plan.wiki