Skip to content

Test refactoring #753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tony merged 12 commits into from
Mar 13, 2022
Merged

Test refactoring #753

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8238ddf
config(flake8): Update to latest black formatting suggestion
tony Mar 13, 2022
58e426c
ci(isort): Use black config
tony Mar 13, 2022
8f057fd
tests(conf): Refactor tmpdir -> tmp_path
tony Mar 13, 2022
a1d56e3
refactor(tests): Move test dir constants to pathlib.Path
tony Mar 13, 2022
05bb102
refactor(tests): Rename constants to _dir -> _PATH and uppercase
tony Mar 13, 2022
38c5179
tests(workspacebuilder): Remove unused formatting
tony Mar 13, 2022
8e4411e
tests: Use home default directory
tony Mar 13, 2022
e2bd17d
refactor(test): Move fixtures to config_fixture fixture (say fixture …
tony Mar 13, 2022
4507f6c
tests: Delete unused constant
tony Mar 13, 2022
2e16cab
Type annotations for module
tony Mar 13, 2022
44e7670
docs: Format
tony Mar 13, 2022
733d0ed
Makefile: Include yaml files in test watching
tony Mar 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor(tests): Rename constants to _dir -> _PATH and uppercase
  • Loading branch information
@tony
tony committed Mar 13, 2022
commit 05bb102175e58106f5969ac332f405a568dfc069
6 changes: 3 additions & 3 deletions tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"""
import pathlib

tests_dir = pathlib.Path(__file__).parent
example_dir = tests_dir.parent / "examples"
fixtures_dir = tests_dir / "fixtures"
TESTS_PATH = pathlib.Path(__file__).parent
EXAMPLE_PATH = TESTS_PATH.parent / "examples"
FIXTURES_PATH = TESTS_PATH / "fixtures"
4 changes: 2 additions & 2 deletions tests/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

from tmuxp import config, exc

from . import example_dir
from . import EXAMPLE_PATH
from .fixtures import config as fixtures

TMUXP_DIR = pathlib.Path(__file__).parent / ".tmuxp"
Expand Down Expand Up @@ -291,7 +291,7 @@ def test_expands_blank_panes():

"""

yaml_config_file = example_dir / "blank-panes.yaml"
yaml_config_file = EXAMPLE_PATH / "blank-panes.yaml"
test_config = load_config(yaml_config_file)
assert config.expand(test_config) == fixtures.expand_blank.expected

Expand Down
12 changes: 6 additions & 6 deletions tests/test_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
from tmuxp.exc import BeforeLoadScriptError, BeforeLoadScriptNotExists
from tmuxp.util import get_session, run_before_script

from . import fixtures_dir
from . import FIXTURES_PATH


def test_raise_BeforeLoadScriptNotExists_if_not_exists():
script_file = fixtures_dir / "script_noexists.sh"
script_file = FIXTURES_PATH / "script_noexists.sh"

with pytest.raises(BeforeLoadScriptNotExists):
run_before_script(script_file)
Expand All @@ -19,30 +19,30 @@ def test_raise_BeforeLoadScriptNotExists_if_not_exists():


def test_raise_BeforeLoadScriptError_if_retcode():
script_file = fixtures_dir / "script_failed.sh"
script_file = FIXTURES_PATH / "script_failed.sh"

with pytest.raises(BeforeLoadScriptError):
run_before_script(script_file)


def test_return_stdout_if_ok(capsys):
script_file = fixtures_dir / "script_complete.sh"
script_file = FIXTURES_PATH / "script_complete.sh"

run_before_script(script_file)
out, err = capsys.readouterr()
assert "hello" in out


def test_beforeload_returncode():
script_file = fixtures_dir / "script_failed.sh"
script_file = FIXTURES_PATH / "script_failed.sh"

with pytest.raises(exc.BeforeLoadScriptError) as excinfo:
run_before_script(script_file)
assert excinfo.match(r"113")


def test_beforeload_returns_stderr_messages():
script_file = fixtures_dir / "script_failed.sh"
script_file = FIXTURES_PATH / "script_failed.sh"

with pytest.raises(exc.BeforeLoadScriptError) as excinfo:
run_before_script(script_file)
Expand Down
20 changes: 10 additions & 10 deletions tests/test_workspacebuilder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from tmuxp.cli import load_plugins
from tmuxp.workspacebuilder import WorkspaceBuilder

from . import example_dir, fixtures_dir
from . import EXAMPLE_PATH, FIXTURES_PATH
from .fixtures._util import load_fixture


Expand Down Expand Up @@ -405,7 +405,7 @@ def test_automatic_rename_option(session):

def test_blank_pane_count(session):
""":todo: Verify blank panes of various types build into workspaces."""
yaml_config_file = example_dir / "blank-panes.yaml"
yaml_config_file = EXAMPLE_PATH / "blank-panes.yaml"
test_config = kaptan.Kaptan().import_config(str(yaml_config_file)).get()
test_config = config.expand(test_config)
builder = WorkspaceBuilder(sconf=test_config)
Expand Down Expand Up @@ -589,8 +589,8 @@ def test_before_load_throw_error_if_retcode_error(server):
config_script_fails = load_fixture("workspacebuilder/config_script_fails.yaml")
sconfig = kaptan.Kaptan(handler="yaml")
yaml = config_script_fails.format(
fixtures_dir=fixtures_dir,
script_failed=fixtures_dir / "script_failed.sh",
fixtures_dir=FIXTURES_PATH,
script_failed=FIXTURES_PATH / "script_failed.sh",
)

sconfig = sconfig.import_config(yaml).get()
Expand All @@ -615,8 +615,8 @@ def test_before_load_throw_error_if_file_not_exists(server):
)
sconfig = kaptan.Kaptan(handler="yaml")
yaml = config_script_not_exists.format(
fixtures_dir=fixtures_dir,
script_not_exists=fixtures_dir / "script_not_exists.sh",
fixtures_dir=FIXTURES_PATH,
script_not_exists=FIXTURES_PATH / "script_not_exists.sh",
)
sconfig = sconfig.import_config(yaml).get()
sconfig = config.expand(sconfig)
Expand All @@ -639,11 +639,11 @@ def test_before_load_true_if_test_passes(server):
config_script_completes = load_fixture(
"workspacebuilder/config_script_completes.yaml"
)
script_complete_sh = fixtures_dir / "script_complete.sh"
script_complete_sh = FIXTURES_PATH / "script_complete.sh"
assert script_complete_sh.exists()
sconfig = kaptan.Kaptan(handler="yaml")
yaml = config_script_completes.format(
fixtures_dir=fixtures_dir,
fixtures_dir=FIXTURES_PATH,
script_complete=script_complete_sh,
)

Expand All @@ -661,11 +661,11 @@ def test_before_load_true_if_test_passes_with_args(server):
config_script_completes = load_fixture(
"workspacebuilder/config_script_completes.yaml"
)
script_complete_sh = fixtures_dir / "script_complete.sh"
script_complete_sh = FIXTURES_PATH / "script_complete.sh"
assert script_complete_sh.exists()
sconfig = kaptan.Kaptan(handler="yaml")
yaml = config_script_completes.format(
fixtures_dir=fixtures_dir, script_complete=script_complete_sh
fixtures_dir=FIXTURES_PATH, script_complete=script_complete_sh
)

sconfig = sconfig.import_config(yaml).get()
Expand Down