Skip to content

Commit bcad6cb

Browse files
committed
pytest: Append test fixture packages via monkeypatch
1 parent 845c6db commit bcad6cb

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

pyproject.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@ pytest-mock = [
6969
{version="<3.0.0", python="<3"},
7070
{version="*", python=">=3"}
7171
]
72-
tmuxp-test-plugin-bwb = { path = "tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_bwb/"}
73-
tmuxp-test-plugin-bs = { path = "tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_bs/"}
74-
tmuxp-test-plugin-r = { path = "tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_r/"}
75-
tmuxp-test-plugin-owc = { path = "tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_owc/"}
76-
tmuxp-test-plugin-awf = { path = "tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_awf/"}
77-
tmuxp-test-plugin-fail = { path = "tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_fail/"}
7872

7973
### Coverage ###
8074
codecov = "*"

tests/conftest.py

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
2-
32
import logging
3+
import os
44

55
import pytest
66

@@ -11,6 +11,20 @@
1111
logger = logging.getLogger(__name__)
1212

1313

14+
@pytest.fixture(autouse=True, scope='function')
15+
def site_packages_test_fixtures(monkeypatch):
16+
paths = [
17+
"tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_bwb/",
18+
"tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_bs/",
19+
"tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_r/",
20+
"tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_owc/",
21+
"tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_awf/",
22+
"tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_fail/",
23+
]
24+
for path in paths:
25+
monkeypatch.syspath_prepend(os.path.abspath(os.path.relpath(path)))
26+
27+
1428
@pytest.fixture(scope='function')
1529
def socket_name(request):
1630
return 'tmuxp_test%s' % next(namer)

tests/test_cli.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,15 @@
1515
import click
1616
import kaptan
1717
from click.testing import CliRunner
18-
from tmuxp_test_plugin_bwb.plugin import PluginBeforeWorkspaceBuilder
1918

2019
import libtmux
2120
from libtmux.common import has_lt_version
2221
from libtmux.exc import LibTmuxException
2322
from tmuxp import cli, config, exc
2423
from tmuxp.cli import (
25-
_reattach,
26-
_load_attached,
2724
_load_append_windows_to_current_session,
25+
_load_attached,
26+
_reattach,
2827
command_debug_info,
2928
command_ls,
3029
get_config_dir,
@@ -996,6 +995,8 @@ def test_ls_cli(monkeypatch, tmpdir):
996995

997996

998997
def test_load_plugins():
998+
from tmuxp_test_plugin_bwb.plugin import PluginBeforeWorkspaceBuilder
999+
9991000
plugins_config = loadfixture("workspacebuilder/plugin_bwb.yaml")
10001001

10011002
sconfig = kaptan.Kaptan(handler='yaml')
@@ -1174,6 +1175,7 @@ def test_load_attached_within_tmux_detached(server, monkeypatch):
11741175

11751176
assert builder.session.switch_client.call_count == 1
11761177

1178+
11771179
def test_load_append_windows_to_current_session(server, monkeypatch):
11781180
yaml_config = loadfixture("workspacebuilder/two_pane.yaml")
11791181
sconfig = kaptan.Kaptan(handler='yaml')
@@ -1195,7 +1197,6 @@ def test_load_append_windows_to_current_session(server, monkeypatch):
11951197
assert len(server._list_windows()) == 6
11961198

11971199

1198-
11991200
def test_debug_info_cli(monkeypatch, tmpdir):
12001201
monkeypatch.setenv('SHELL', '/bin/bash')
12011202

0 commit comments

Comments
 (0)