Skip to content

Commit f10676a

Browse files
committed
monkeypatch_plugin_test_packages: Opt-in
1 parent bcad6cb commit f10676a

File tree

4 files changed

+32
-17
lines changed

4 files changed

+32
-17
lines changed

tests/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
logger = logging.getLogger(__name__)
1212

1313

14-
@pytest.fixture(autouse=True, scope='function')
15-
def site_packages_test_fixtures(monkeypatch):
14+
@pytest.fixture(scope='function')
15+
def monkeypatch_plugin_test_packages(monkeypatch):
1616
paths = [
1717
"tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_bwb/",
1818
"tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_bs/",

tests/test_cli.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,7 @@ def test_ls_cli(monkeypatch, tmpdir):
994994
assert cli_output == '\n'.join(stems) + '\n'
995995

996996

997-
def test_load_plugins():
997+
def test_load_plugins(monkeypatch_plugin_test_packages):
998998
from tmuxp_test_plugin_bwb.plugin import PluginBeforeWorkspaceBuilder
999999

10001000
plugins_config = loadfixture("workspacebuilder/plugin_bwb.yaml")
@@ -1024,7 +1024,9 @@ def test_load_plugins():
10241024
)
10251025
],
10261026
)
1027-
def test_load_plugins_version_fail_skip(cli_args, inputs):
1027+
def test_load_plugins_version_fail_skip(
1028+
monkeypatch_plugin_test_packages, cli_args, inputs
1029+
):
10281030
runner = CliRunner()
10291031

10301032
results = runner.invoke(cli.cli, cli_args, input=''.join(inputs))
@@ -1040,7 +1042,9 @@ def test_load_plugins_version_fail_skip(cli_args, inputs):
10401042
)
10411043
],
10421044
)
1043-
def test_load_plugins_version_fail_no_skip(cli_args, inputs):
1045+
def test_load_plugins_version_fail_no_skip(
1046+
monkeypatch_plugin_test_packages, cli_args, inputs
1047+
):
10441048
runner = CliRunner()
10451049

10461050
results = runner.invoke(cli.cli, cli_args, input=''.join(inputs))
@@ -1050,14 +1054,16 @@ def test_load_plugins_version_fail_no_skip(cli_args, inputs):
10501054
@pytest.mark.parametrize(
10511055
"cli_args", [(['load', 'tests/fixtures/workspacebuilder/plugin_missing_fail.yaml'])]
10521056
)
1053-
def test_load_plugins_plugin_missing(cli_args):
1057+
def test_load_plugins_plugin_missing(monkeypatch_plugin_test_packages, cli_args):
10541058
runner = CliRunner()
10551059

10561060
results = runner.invoke(cli.cli, cli_args)
10571061
assert '[Plugin Error]' in results.output
10581062

10591063

1060-
def test_plugin_system_before_script(server, monkeypatch):
1064+
def test_plugin_system_before_script(
1065+
monkeypatch_plugin_test_packages, server, monkeypatch
1066+
):
10611067
# this is an implementation test. Since this testsuite may be ran within
10621068
# a tmux session by the developer himself, delete the TMUX variable
10631069
# temporarily.
@@ -1073,7 +1079,7 @@ def test_plugin_system_before_script(server, monkeypatch):
10731079
assert session.name == 'plugin_test_bs'
10741080

10751081

1076-
def test_reattach_plugins(server):
1082+
def test_reattach_plugins(monkeypatch_plugin_test_packages, server):
10771083
config_plugins = loadfixture("workspacebuilder/plugin_r.yaml")
10781084

10791085
sconfig = kaptan.Kaptan(handler='yaml')

tests/test_plugin.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424
)
2525

2626

27+
@pytest.fixture(autouse=True)
28+
def autopatch_sitedir(monkeypatch_plugin_test_packages):
29+
pass
30+
31+
2732
def test_all_pass():
2833
AllVersionPassPlugin()
2934

tests/test_workspacebuilder.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
from libtmux.test import retry, temp_session
1515
from tmuxp import config, exc
1616
from tmuxp._compat import text_type
17-
from tmuxp.workspacebuilder import WorkspaceBuilder
1817
from tmuxp.cli import load_plugins
18+
from tmuxp.workspacebuilder import WorkspaceBuilder
1919

2020
from . import example_dir, fixtures_dir
2121
from .fixtures._util import loadfixture
@@ -676,7 +676,9 @@ def test_before_load_true_if_test_passes_with_args(server):
676676
builder.build(session=session)
677677

678678

679-
def test_plugin_system_before_workspace_builder(session):
679+
def test_plugin_system_before_workspace_builder(
680+
monkeypatch_plugin_test_packages, session
681+
):
680682
config_plugins = loadfixture("workspacebuilder/plugin_bwb.yaml")
681683

682684
sconfig = kaptan.Kaptan(handler='yaml')
@@ -692,7 +694,7 @@ def test_plugin_system_before_workspace_builder(session):
692694
assert proc.stdout[0] == "'plugin_test_bwb'"
693695

694696

695-
def test_plugin_system_on_window_create(session):
697+
def test_plugin_system_on_window_create(monkeypatch_plugin_test_packages, session):
696698
config_plugins = loadfixture("workspacebuilder/plugin_owc.yaml")
697699

698700
sconfig = kaptan.Kaptan(handler='yaml')
@@ -708,7 +710,7 @@ def test_plugin_system_on_window_create(session):
708710
assert proc.stdout[0] == "'plugin_test_owc'"
709711

710712

711-
def test_plugin_system_after_window_finished(session):
713+
def test_plugin_system_after_window_finished(monkeypatch_plugin_test_packages, session):
712714
config_plugins = loadfixture("workspacebuilder/plugin_awf.yaml")
713715

714716
sconfig = kaptan.Kaptan(handler='yaml')
@@ -741,7 +743,9 @@ def test_plugin_system_on_window_create_multiple_windows(session):
741743
assert "'plugin_test_owc_mw_2'" in proc.stdout
742744

743745

744-
def test_plugin_system_after_window_finished_multiple_windows(session):
746+
def test_plugin_system_after_window_finished_multiple_windows(
747+
monkeypatch_plugin_test_packages, session
748+
):
745749
config_plugins = loadfixture("workspacebuilder/plugin_awf_multiple_windows.yaml")
746750

747751
sconfig = kaptan.Kaptan(handler='yaml')
@@ -758,7 +762,7 @@ def test_plugin_system_after_window_finished_multiple_windows(session):
758762
assert "'plugin_test_awf_mw_2'" in proc.stdout
759763

760764

761-
def test_plugin_system_multiple_plugins(session):
765+
def test_plugin_system_multiple_plugins(monkeypatch_plugin_test_packages, session):
762766
config_plugins = loadfixture("workspacebuilder/plugin_multiple_plugins.yaml")
763767

764768
sconfig = kaptan.Kaptan(handler='yaml')
@@ -858,9 +862,9 @@ def test_find_current_active_pane(server, monkeypatch):
858862

859863
# Assign an active pane to the session
860864
second_session = server.list_sessions()[1]
861-
first_pane_on_second_session_id = (
862-
second_session.list_windows()[0].list_panes()[0]["pane_id"]
863-
)
865+
first_pane_on_second_session_id = second_session.list_windows()[0].list_panes()[0][
866+
"pane_id"
867+
]
864868
monkeypatch.setenv("TMUX_PANE", first_pane_on_second_session_id)
865869

866870
builder = WorkspaceBuilder(sconf=sconfig, server=server)

0 commit comments

Comments
 (0)