Merge pull request #1739 from dbcli/RW/gather-pytest-files

Gather pytest files in a subdirectory

Author: rolandwalker

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)

test/conftest.py test/pytests/conftest.pytest/conftest.py renamed to test/pytests/conftest.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):

test/test_clistyle.py test/pytests/test_clistyle.pytest/test_clistyle.py renamed to test/pytests/test_clistyle.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():

test/test_clitoolbar.py test/pytests/test_clitoolbar.pytest/test_clitoolbar.py renamed to test/pytests/test_clitoolbar.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 = [