diff --git a/tests/__init__.py b/tests/__init__.py index 6233b234811..e69de29bb2d 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,11 +0,0 @@ -"""Tests for tmuxp. - -tmuxp.tests -~~~~~~~~~~~ - -""" -import pathlib - -TESTS_PATH = pathlib.Path(__file__).parent -EXAMPLE_PATH = TESTS_PATH.parent / "examples" -FIXTURES_PATH = TESTS_PATH / "fixtures" diff --git a/tests/constants.py b/tests/constants.py new file mode 100644 index 00000000000..9fa14e00f07 --- /dev/null +++ b/tests/constants.py @@ -0,0 +1,5 @@ +import pathlib + +TESTS_PATH = pathlib.Path(__file__).parent +EXAMPLE_PATH = TESTS_PATH.parent / "examples" +FIXTURE_PATH = TESTS_PATH / "fixtures" diff --git a/tests/fixtures/__init__.py b/tests/fixtures/__init__.py index 3e227e3c078..a81b5f2914d 100644 --- a/tests/fixtures/__init__.py +++ b/tests/fixtures/__init__.py @@ -1 +1 @@ -from . import _util # noqa +from . import utils # noqa diff --git a/tests/fixtures/config/expand2.py b/tests/fixtures/config/expand2.py index af00ec92535..4cd49336ddb 100644 --- a/tests/fixtures/config/expand2.py +++ b/tests/fixtures/config/expand2.py @@ -1,8 +1,8 @@ import os -from .._util import load_fixture +from .. import utils as test_utils -unexpanded_yaml = load_fixture("config/expand2-unexpanded.yaml") -expanded_yaml = load_fixture("config/expand2-expanded.yaml").format( +unexpanded_yaml = test_utils.read_config_file("config/expand2-unexpanded.yaml") +expanded_yaml = test_utils.read_config_file("config/expand2-expanded.yaml").format( HOME=os.path.expanduser("~") ) diff --git a/tests/fixtures/config/shell_command_before_session.py b/tests/fixtures/config/shell_command_before_session.py index d7429097ad0..c4f260f7a01 100644 --- a/tests/fixtures/config/shell_command_before_session.py +++ b/tests/fixtures/config/shell_command_before_session.py @@ -1,4 +1,6 @@ -from .._util import load_fixture +from .. import utils as test_utils -before = load_fixture("config/shell_command_before_session.yaml") -expected = load_fixture("config/shell_command_before_session-expected.yaml") +before = test_utils.read_config_file("config/shell_command_before_session.yaml") +expected = test_utils.read_config_file( + "config/shell_command_before_session-expected.yaml" +) diff --git a/tests/fixtures/config_teamocil/layouts.py b/tests/fixtures/config_teamocil/layouts.py index aaa7de25b27..c61373fd8a1 100644 --- a/tests/fixtures/config_teamocil/layouts.py +++ b/tests/fixtures/config_teamocil/layouts.py @@ -1,6 +1,6 @@ -from .._util import load_fixture +from .. import utils as test_utils -teamocil_yaml = load_fixture("config_teamocil/layouts.yaml") +teamocil_yaml = test_utils.read_config_file("config_teamocil/layouts.yaml") teamocil_dict = { "two-windows": { diff --git a/tests/fixtures/config_teamocil/test1.py b/tests/fixtures/config_teamocil/test1.py index 4bbf3fe6871..ee329c06616 100644 --- a/tests/fixtures/config_teamocil/test1.py +++ b/tests/fixtures/config_teamocil/test1.py @@ -1,6 +1,6 @@ -from .._util import load_fixture +from .. import utils as test_utils -teamocil_yaml = load_fixture("config_teamocil/test1.yaml") +teamocil_yaml = test_utils.read_config_file("config_teamocil/test1.yaml") teamocil_conf = { "windows": [ { diff --git a/tests/fixtures/config_teamocil/test2.py b/tests/fixtures/config_teamocil/test2.py index bc78e1e0f8b..dd68433b05a 100644 --- a/tests/fixtures/config_teamocil/test2.py +++ b/tests/fixtures/config_teamocil/test2.py @@ -1,6 +1,6 @@ -from .._util import load_fixture +from .. import utils as test_utils -teamocil_yaml = load_fixture("config_teamocil/test2.yaml") +teamocil_yaml = test_utils.read_config_file("config_teamocil/test2.yaml") teamocil_dict = { "windows": [ { diff --git a/tests/fixtures/config_teamocil/test3.py b/tests/fixtures/config_teamocil/test3.py index 7e33fcafc89..436e9e4a737 100644 --- a/tests/fixtures/config_teamocil/test3.py +++ b/tests/fixtures/config_teamocil/test3.py @@ -1,6 +1,6 @@ -from .._util import load_fixture +from .. import utils as test_utils -teamocil_yaml = load_fixture("config_teamocil/test3.yaml") +teamocil_yaml = test_utils.read_config_file("config_teamocil/test3.yaml") teamocil_dict = { "windows": [ diff --git a/tests/fixtures/config_teamocil/test4.py b/tests/fixtures/config_teamocil/test4.py index b734e4b4cac..293fb958fb3 100644 --- a/tests/fixtures/config_teamocil/test4.py +++ b/tests/fixtures/config_teamocil/test4.py @@ -1,6 +1,6 @@ -from .._util import load_fixture +from .. import utils as test_utils -teamocil_yaml = load_fixture("config_teamocil/test4.yaml") +teamocil_yaml = test_utils.read_config_file("config_teamocil/test4.yaml") teamocil_dict = { "windows": [ diff --git a/tests/fixtures/config_tmuxinator/test1.py b/tests/fixtures/config_tmuxinator/test1.py index 34295c974d5..b1499717433 100644 --- a/tests/fixtures/config_tmuxinator/test1.py +++ b/tests/fixtures/config_tmuxinator/test1.py @@ -1,6 +1,6 @@ -from .._util import load_fixture +from .. import utils as test_utils -tmuxinator_yaml = load_fixture("config_tmuxinator/test1.yaml") +tmuxinator_yaml = test_utils.read_config_file("config_tmuxinator/test1.yaml") tmuxinator_dict = { "windows": [ {"editor": {"layout": "main-vertical", "panes": ["vim", "guard"]}}, diff --git a/tests/fixtures/config_tmuxinator/test2.py b/tests/fixtures/config_tmuxinator/test2.py index d1c97612b08..f90caa8cd92 100644 --- a/tests/fixtures/config_tmuxinator/test2.py +++ b/tests/fixtures/config_tmuxinator/test2.py @@ -1,6 +1,6 @@ -from .._util import load_fixture +from .. import utils as test_utils -tmuxinator_yaml = load_fixture("config_tmuxinator/test2.yaml") +tmuxinator_yaml = test_utils.read_config_file("config_tmuxinator/test2.yaml") tmuxinator_dict = { "project_name": "sample", diff --git a/tests/fixtures/config_tmuxinator/test3.py b/tests/fixtures/config_tmuxinator/test3.py index f4f36370768..ce8a8b93f4e 100644 --- a/tests/fixtures/config_tmuxinator/test3.py +++ b/tests/fixtures/config_tmuxinator/test3.py @@ -1,6 +1,6 @@ -from .._util import load_fixture +from .. import utils as test_utils -tmuxinator_yaml = load_fixture("config_tmuxinator/test3.yaml") +tmuxinator_yaml = test_utils.read_config_file("config_tmuxinator/test3.yaml") tmuxinator_dict = { "name": "sample", diff --git a/tests/fixtures/_util.py b/tests/fixtures/utils.py similarity index 69% rename from tests/fixtures/_util.py rename to tests/fixtures/utils.py index b0c01c1f932..5d1ec632306 100644 --- a/tests/fixtures/_util.py +++ b/tests/fixtures/utils.py @@ -1,9 +1,9 @@ import pathlib -FIXTURE_PATH = pathlib.Path(__file__).parent +from ..constants import FIXTURE_PATH -def load_fixture(_file): # return fixture data, relative to __file__ +def read_config_file(_file): # return fixture data, relative to __file__ return open(FIXTURE_PATH / _file).read() diff --git a/tests/test_cli.py b/tests/test_cli.py index 90ad5c155a2..db8b1f84fa2 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -28,7 +28,8 @@ ) from tmuxp.workspacebuilder import WorkspaceBuilder -from .fixtures._util import FIXTURE_PATH, load_fixture +from .constants import FIXTURE_PATH +from .fixtures import utils as test_utils def test_creates_config_dir_not_exists(tmp_path: pathlib.Path): @@ -861,7 +862,7 @@ def test_help(cli_args, monkeypatch): ], ) def test_import_teamocil(cli_args, inputs, tmp_path, monkeypatch): - teamocil_config = load_fixture("config_teamocil/test4.yaml") + teamocil_config = test_utils.read_config_file("config_teamocil/test4.yaml") teamocil_path = tmp_path / ".teamocil" teamocil_path.mkdir() @@ -900,7 +901,7 @@ def test_import_teamocil(cli_args, inputs, tmp_path, monkeypatch): ], ) def test_import_tmuxinator(cli_args, inputs, tmp_path, monkeypatch): - tmuxinator_config = load_fixture("config_tmuxinator/test3.yaml") + tmuxinator_config = test_utils.read_config_file("config_tmuxinator/test3.yaml") tmuxinator_path = tmp_path / ".tmuxinator" tmuxinator_path.mkdir() @@ -1103,7 +1104,7 @@ def test_ls_cli(monkeypatch: pytest.MonkeyPatch, tmp_path: pathlib.Path): def test_load_plugins(monkeypatch_plugin_test_packages): from tmuxp_test_plugin_bwb.plugin import PluginBeforeWorkspaceBuilder - plugins_config = load_fixture("workspacebuilder/plugin_bwb.yaml") + plugins_config = test_utils.read_config_file("workspacebuilder/plugin_bwb.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(plugins_config).get() @@ -1186,7 +1187,7 @@ def test_plugin_system_before_script( def test_reattach_plugins(monkeypatch_plugin_test_packages, server): - config_plugins = load_fixture("workspacebuilder/plugin_r.yaml") + config_plugins = test_utils.read_config_file("workspacebuilder/plugin_r.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(config_plugins).get() @@ -1217,7 +1218,7 @@ def test_load_attached(server, monkeypatch): monkeypatch.setattr("libtmux.session.Session.attach_session", attach_session_mock) - yaml_config = load_fixture("workspacebuilder/two_pane.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/two_pane.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() @@ -1237,7 +1238,7 @@ def test_load_attached_detached(server, monkeypatch): monkeypatch.setattr("libtmux.session.Session.attach_session", attach_session_mock) - yaml_config = load_fixture("workspacebuilder/two_pane.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/two_pane.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() @@ -1257,7 +1258,7 @@ def test_load_attached_within_tmux(server, monkeypatch): monkeypatch.setattr("libtmux.session.Session.switch_client", switch_client_mock) - yaml_config = load_fixture("workspacebuilder/two_pane.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/two_pane.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() @@ -1277,7 +1278,7 @@ def test_load_attached_within_tmux_detached(server, monkeypatch): monkeypatch.setattr("libtmux.session.Session.switch_client", switch_client_mock) - yaml_config = load_fixture("workspacebuilder/two_pane.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/two_pane.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() @@ -1289,7 +1290,7 @@ def test_load_attached_within_tmux_detached(server, monkeypatch): def test_load_append_windows_to_current_session(server, monkeypatch): - yaml_config = load_fixture("workspacebuilder/two_pane.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/two_pane.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() diff --git a/tests/test_config.py b/tests/test_config.py index 1352d0034c7..de776b35bf2 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -10,7 +10,7 @@ from tmuxp import config, exc -from . import EXAMPLE_PATH +from .constants import EXAMPLE_PATH if typing.TYPE_CHECKING: from .fixtures import config as ConfigFixture diff --git a/tests/test_util.py b/tests/test_util.py index c5f5b53824a..2dbe5c1904c 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -5,11 +5,11 @@ from tmuxp.exc import BeforeLoadScriptError, BeforeLoadScriptNotExists from tmuxp.util import get_session, run_before_script -from . import FIXTURES_PATH +from .constants import FIXTURE_PATH def test_raise_BeforeLoadScriptNotExists_if_not_exists(): - script_file = FIXTURES_PATH / "script_noexists.sh" + script_file = FIXTURE_PATH / "script_noexists.sh" with pytest.raises(BeforeLoadScriptNotExists): run_before_script(script_file) @@ -19,14 +19,14 @@ def test_raise_BeforeLoadScriptNotExists_if_not_exists(): def test_raise_BeforeLoadScriptError_if_retcode(): - script_file = FIXTURES_PATH / "script_failed.sh" + script_file = FIXTURE_PATH / "script_failed.sh" with pytest.raises(BeforeLoadScriptError): run_before_script(script_file) def test_return_stdout_if_ok(capsys): - script_file = FIXTURES_PATH / "script_complete.sh" + script_file = FIXTURE_PATH / "script_complete.sh" run_before_script(script_file) out, err = capsys.readouterr() @@ -34,7 +34,7 @@ def test_return_stdout_if_ok(capsys): def test_beforeload_returncode(): - script_file = FIXTURES_PATH / "script_failed.sh" + script_file = FIXTURE_PATH / "script_failed.sh" with pytest.raises(exc.BeforeLoadScriptError) as excinfo: run_before_script(script_file) @@ -42,7 +42,7 @@ def test_beforeload_returncode(): def test_beforeload_returns_stderr_messages(): - script_file = FIXTURES_PATH / "script_failed.sh" + script_file = FIXTURE_PATH / "script_failed.sh" with pytest.raises(exc.BeforeLoadScriptError) as excinfo: run_before_script(script_file) diff --git a/tests/test_workspacebuilder.py b/tests/test_workspacebuilder.py index c10fa7268fa..52cb3f67057 100644 --- a/tests/test_workspacebuilder.py +++ b/tests/test_workspacebuilder.py @@ -16,12 +16,12 @@ from tmuxp.cli import load_plugins from tmuxp.workspacebuilder import WorkspaceBuilder -from . import EXAMPLE_PATH, FIXTURES_PATH -from .fixtures._util import load_fixture +from .constants import EXAMPLE_PATH, FIXTURE_PATH +from .fixtures import utils as test_utils def test_split_windows(session): - yaml_config = load_fixture("workspacebuilder/two_pane.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/two_pane.yaml") s = session sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() @@ -42,7 +42,7 @@ def test_split_windows(session): def test_split_windows_three_pane(session): - yaml_config = load_fixture("workspacebuilder/three_pane.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/three_pane.yaml") s = session sconfig = kaptan.Kaptan(handler="yaml") @@ -66,7 +66,7 @@ def test_split_windows_three_pane(session): def test_focus_pane_index(session): - yaml_config = load_fixture("workspacebuilder/focus_and_pane.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/focus_and_pane.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() @@ -136,7 +136,7 @@ def test_focus_pane_index(session): """.strip() ) def test_suppress_history(session): - yaml_config = load_fixture("workspacebuilder/suppress_history.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/suppress_history.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() sconfig = config.expand(sconfig) @@ -190,7 +190,7 @@ def assertIsMissing(cmd, hist): def test_session_options(session): - yaml_config = load_fixture("workspacebuilder/session_options.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/session_options.yaml") s = session sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() @@ -204,7 +204,7 @@ def test_session_options(session): def test_global_options(session): - yaml_config = load_fixture("workspacebuilder/global_options.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/global_options.yaml") s = session sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() @@ -225,7 +225,7 @@ def test_global_session_env_options(session, monkeypatch): main_pane_height = 8 monkeypatch.setenv("MAIN_PANE_HEIGHT", str(main_pane_height)) - yaml_config = load_fixture("workspacebuilder/env_var_options.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/env_var_options.yaml") s = session sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() @@ -240,7 +240,7 @@ def test_global_session_env_options(session, monkeypatch): def test_window_options(session): - yaml_config = load_fixture("workspacebuilder/window_options.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/window_options.yaml") s = session sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() @@ -270,7 +270,9 @@ def test_window_options(session): @pytest.mark.flaky(reruns=5) def test_window_options_after(session): - yaml_config = load_fixture("workspacebuilder/window_options_after.yaml") + yaml_config = test_utils.read_config_file( + "workspacebuilder/window_options_after.yaml" + ) sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() sconfig = config.expand(sconfig) @@ -315,7 +317,7 @@ def assert_last_line(p, s): def test_window_shell(session): - yaml_config = load_fixture("workspacebuilder/window_shell.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/window_shell.yaml") s = session sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() @@ -336,7 +338,7 @@ def test_window_shell(session): def test_environment_variables(session): - yaml_config = load_fixture("workspacebuilder/environment_vars.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/environment_vars.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() sconfig = config.expand(sconfig) @@ -350,7 +352,9 @@ def test_environment_variables(session): def test_automatic_rename_option(session): """With option automatic-rename: on.""" - yaml_config = load_fixture("workspacebuilder/window_automatic_rename.yaml") + yaml_config = test_utils.read_config_file( + "workspacebuilder/window_automatic_rename.yaml" + ) s = session sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() @@ -427,7 +431,7 @@ def test_blank_pane_count(session): def test_start_directory(session, tmp_path: pathlib.Path): - yaml_config = load_fixture("workspacebuilder/start_directory.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/start_directory.yaml") test_dir = tmp_path / "foo bar" test_dir.mkdir() test_config = yaml_config.format(TEST_DIR=test_dir) @@ -470,7 +474,9 @@ def test_start_directory_relative(session, tmp_path: pathlib.Path): $ tmuxp load . """ - yaml_config = load_fixture("workspacebuilder/start_directory_relative.yaml") + yaml_config = test_utils.read_config_file( + "workspacebuilder/start_directory_relative.yaml" + ) test_dir = tmp_path / "foo bar" test_dir.mkdir() @@ -517,9 +523,9 @@ def test_pane_order(session): """ - yaml_config = load_fixture("workspacebuilder/pane_ordering.yaml").format( - HOME=os.path.realpath(os.path.expanduser("~")) - ) + yaml_config = test_utils.read_config_file( + "workspacebuilder/pane_ordering.yaml" + ).format(HOME=os.path.realpath(os.path.expanduser("~"))) # test order of `panes` (and pane_index) above against pane_dirs pane_paths = [ @@ -568,7 +574,7 @@ def test_pane_order(session): def test_window_index(session): - yaml_config = load_fixture("workspacebuilder/window_index.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/window_index.yaml") proc = session.cmd("show-option", "-gv", "base-index") base_index = int(proc.stdout[0]) name_index_map = {"zero": 0 + base_index, "one": 1 + base_index, "five": 5} @@ -586,10 +592,12 @@ def test_window_index(session): def test_before_load_throw_error_if_retcode_error(server): - config_script_fails = load_fixture("workspacebuilder/config_script_fails.yaml") + config_script_fails = test_utils.read_config_file( + "workspacebuilder/config_script_fails.yaml" + ) sconfig = kaptan.Kaptan(handler="yaml") yaml = config_script_fails.format( - script_failed=FIXTURES_PATH / "script_failed.sh", + script_failed=FIXTURE_PATH / "script_failed.sh", ) sconfig = sconfig.import_config(yaml).get() @@ -609,12 +617,12 @@ def test_before_load_throw_error_if_retcode_error(server): def test_before_load_throw_error_if_file_not_exists(server): - config_script_not_exists = load_fixture( + config_script_not_exists = test_utils.read_config_file( "workspacebuilder/config_script_not_exists.yaml" ) sconfig = kaptan.Kaptan(handler="yaml") yaml = config_script_not_exists.format( - script_not_exists=FIXTURES_PATH / "script_not_exists.sh", + script_not_exists=FIXTURE_PATH / "script_not_exists.sh", ) sconfig = sconfig.import_config(yaml).get() sconfig = config.expand(sconfig) @@ -634,10 +642,10 @@ def test_before_load_throw_error_if_file_not_exists(server): def test_before_load_true_if_test_passes(server): - config_script_completes = load_fixture( + config_script_completes = test_utils.read_config_file( "workspacebuilder/config_script_completes.yaml" ) - script_complete_sh = FIXTURES_PATH / "script_complete.sh" + script_complete_sh = FIXTURE_PATH / "script_complete.sh" assert script_complete_sh.exists() sconfig = kaptan.Kaptan(handler="yaml") yaml = config_script_completes.format( @@ -655,10 +663,10 @@ def test_before_load_true_if_test_passes(server): def test_before_load_true_if_test_passes_with_args(server): - config_script_completes = load_fixture( + config_script_completes = test_utils.read_config_file( "workspacebuilder/config_script_completes.yaml" ) - script_complete_sh = FIXTURES_PATH / "script_complete.sh" + script_complete_sh = FIXTURE_PATH / "script_complete.sh" assert script_complete_sh.exists() sconfig = kaptan.Kaptan(handler="yaml") yaml = config_script_completes.format(script_complete=script_complete_sh) @@ -676,7 +684,7 @@ def test_before_load_true_if_test_passes_with_args(server): def test_plugin_system_before_workspace_builder( monkeypatch_plugin_test_packages, session ): - config_plugins = load_fixture("workspacebuilder/plugin_bwb.yaml") + config_plugins = test_utils.read_config_file("workspacebuilder/plugin_bwb.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(config_plugins).get() @@ -692,7 +700,7 @@ def test_plugin_system_before_workspace_builder( def test_plugin_system_on_window_create(monkeypatch_plugin_test_packages, session): - config_plugins = load_fixture("workspacebuilder/plugin_owc.yaml") + config_plugins = test_utils.read_config_file("workspacebuilder/plugin_owc.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(config_plugins).get() @@ -708,7 +716,7 @@ def test_plugin_system_on_window_create(monkeypatch_plugin_test_packages, sessio def test_plugin_system_after_window_finished(monkeypatch_plugin_test_packages, session): - config_plugins = load_fixture("workspacebuilder/plugin_awf.yaml") + config_plugins = test_utils.read_config_file("workspacebuilder/plugin_awf.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(config_plugins).get() @@ -724,7 +732,9 @@ def test_plugin_system_after_window_finished(monkeypatch_plugin_test_packages, s def test_plugin_system_on_window_create_multiple_windows(session): - config_plugins = load_fixture("workspacebuilder/plugin_owc_multiple_windows.yaml") + config_plugins = test_utils.read_config_file( + "workspacebuilder/plugin_owc_multiple_windows.yaml" + ) sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(config_plugins).get() @@ -743,7 +753,9 @@ def test_plugin_system_on_window_create_multiple_windows(session): def test_plugin_system_after_window_finished_multiple_windows( monkeypatch_plugin_test_packages, session ): - config_plugins = load_fixture("workspacebuilder/plugin_awf_multiple_windows.yaml") + config_plugins = test_utils.read_config_file( + "workspacebuilder/plugin_awf_multiple_windows.yaml" + ) sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(config_plugins).get() @@ -760,7 +772,9 @@ def test_plugin_system_after_window_finished_multiple_windows( def test_plugin_system_multiple_plugins(monkeypatch_plugin_test_packages, session): - config_plugins = load_fixture("workspacebuilder/plugin_multiple_plugins.yaml") + config_plugins = test_utils.read_config_file( + "workspacebuilder/plugin_multiple_plugins.yaml" + ) sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(config_plugins).get() @@ -783,7 +797,7 @@ def test_plugin_system_multiple_plugins(monkeypatch_plugin_test_packages, sessio def test_load_configs_same_session(server): - yaml_config = load_fixture("workspacebuilder/three_windows.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/three_windows.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() @@ -793,7 +807,7 @@ def test_load_configs_same_session(server): assert len(server.sessions) == 1 assert len(server.sessions[0]._windows) == 3 - yaml_config = load_fixture("workspacebuilder/two_windows.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/two_windows.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() @@ -803,7 +817,7 @@ def test_load_configs_same_session(server): assert len(server.sessions) == 2 assert len(server.sessions[1]._windows) == 2 - yaml_config = load_fixture("workspacebuilder/two_windows.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/two_windows.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() @@ -816,7 +830,7 @@ def test_load_configs_same_session(server): def test_load_configs_separate_sessions(server): - yaml_config = load_fixture("workspacebuilder/three_windows.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/three_windows.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() @@ -826,7 +840,7 @@ def test_load_configs_separate_sessions(server): assert len(server.sessions) == 1 assert len(server.sessions[0]._windows) == 3 - yaml_config = load_fixture("workspacebuilder/two_windows.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/two_windows.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() @@ -840,14 +854,14 @@ def test_load_configs_separate_sessions(server): def test_find_current_active_pane(server, monkeypatch): - yaml_config = load_fixture("workspacebuilder/three_windows.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/three_windows.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() builder = WorkspaceBuilder(sconf=sconfig, server=server) builder.build() - yaml_config = load_fixture("workspacebuilder/two_windows.yaml") + yaml_config = test_utils.read_config_file("workspacebuilder/two_windows.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get() diff --git a/tests/test_workspacefreezer.py b/tests/test_workspacefreezer.py index fb34bc35547..659295ae849 100644 --- a/tests/test_workspacefreezer.py +++ b/tests/test_workspacefreezer.py @@ -6,11 +6,11 @@ from tmuxp import config from tmuxp.workspacebuilder import WorkspaceBuilder, freeze -from .fixtures._util import load_fixture +from .fixtures import utils as test_utils def test_freeze_config(session): - yaml_config = load_fixture("workspacefreezer/sampleconfig.yaml") + yaml_config = test_utils.read_config_file("workspacefreezer/sampleconfig.yaml") sconfig = kaptan.Kaptan(handler="yaml") sconfig = sconfig.import_config(yaml_config).get()