Skip to content

Commit fcc2bb8

Browse files
committed
refactor(tests): Rename constants to _dir -> _PATH and uppercase
1 parent 6917872 commit fcc2bb8

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

tests/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"""
77
import pathlib
88

9-
tests_dir = pathlib.Path(__file__).parent
10-
example_dir = tests_dir.parent / "examples"
11-
fixtures_dir = tests_dir / "fixtures"
9+
TESTS_PATH = pathlib.Path(__file__).parent
10+
EXAMPLE_PATH = TESTS_PATH.parent / "examples"
11+
FIXTURES_PATH = TESTS_PATH / "fixtures"

tests/test_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
from tmuxp import config, exc
1111

12-
from . import example_dir
12+
from . import EXAMPLE_PATH
1313
from .fixtures import config as fixtures
1414

1515
TMUXP_DIR = pathlib.Path(__file__).parent / ".tmuxp"
@@ -291,7 +291,7 @@ def test_expands_blank_panes():
291291
292292
"""
293293

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

tests/test_util.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
from tmuxp.exc import BeforeLoadScriptError, BeforeLoadScriptNotExists
66
from tmuxp.util import get_session, run_before_script
77

8-
from . import fixtures_dir
8+
from . import FIXTURES_PATH
99

1010

1111
def test_raise_BeforeLoadScriptNotExists_if_not_exists():
12-
script_file = fixtures_dir / "script_noexists.sh"
12+
script_file = FIXTURES_PATH / "script_noexists.sh"
1313

1414
with pytest.raises(BeforeLoadScriptNotExists):
1515
run_before_script(script_file)
@@ -19,30 +19,30 @@ def test_raise_BeforeLoadScriptNotExists_if_not_exists():
1919

2020

2121
def test_raise_BeforeLoadScriptError_if_retcode():
22-
script_file = fixtures_dir / "script_failed.sh"
22+
script_file = FIXTURES_PATH / "script_failed.sh"
2323

2424
with pytest.raises(BeforeLoadScriptError):
2525
run_before_script(script_file)
2626

2727

2828
def test_return_stdout_if_ok(capsys):
29-
script_file = fixtures_dir / "script_complete.sh"
29+
script_file = FIXTURES_PATH / "script_complete.sh"
3030

3131
run_before_script(script_file)
3232
out, err = capsys.readouterr()
3333
assert "hello" in out
3434

3535

3636
def test_beforeload_returncode():
37-
script_file = fixtures_dir / "script_failed.sh"
37+
script_file = FIXTURES_PATH / "script_failed.sh"
3838

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

4343

4444
def test_beforeload_returns_stderr_messages():
45-
script_file = fixtures_dir / "script_failed.sh"
45+
script_file = FIXTURES_PATH / "script_failed.sh"
4646

4747
with pytest.raises(exc.BeforeLoadScriptError) as excinfo:
4848
run_before_script(script_file)

tests/test_workspacebuilder.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from tmuxp.cli import load_plugins
1717
from tmuxp.workspacebuilder import WorkspaceBuilder
1818

19-
from . import example_dir, fixtures_dir
19+
from . import EXAMPLE_PATH, FIXTURES_PATH
2020
from .fixtures._util import load_fixture
2121

2222

@@ -405,7 +405,7 @@ def test_automatic_rename_option(session):
405405

406406
def test_blank_pane_count(session):
407407
""":todo: Verify blank panes of various types build into workspaces."""
408-
yaml_config_file = example_dir / "blank-panes.yaml"
408+
yaml_config_file = EXAMPLE_PATH / "blank-panes.yaml"
409409
test_config = kaptan.Kaptan().import_config(str(yaml_config_file)).get()
410410
test_config = config.expand(test_config)
411411
builder = WorkspaceBuilder(sconf=test_config)
@@ -589,8 +589,8 @@ def test_before_load_throw_error_if_retcode_error(server):
589589
config_script_fails = load_fixture("workspacebuilder/config_script_fails.yaml")
590590
sconfig = kaptan.Kaptan(handler="yaml")
591591
yaml = config_script_fails.format(
592-
fixtures_dir=fixtures_dir,
593-
script_failed=fixtures_dir / "script_failed.sh",
592+
fixtures_dir=FIXTURES_PATH,
593+
script_failed=FIXTURES_PATH / "script_failed.sh",
594594
)
595595

596596
sconfig = sconfig.import_config(yaml).get()
@@ -615,8 +615,8 @@ def test_before_load_throw_error_if_file_not_exists(server):
615615
)
616616
sconfig = kaptan.Kaptan(handler="yaml")
617617
yaml = config_script_not_exists.format(
618-
fixtures_dir=fixtures_dir,
619-
script_not_exists=fixtures_dir / "script_not_exists.sh",
618+
fixtures_dir=FIXTURES_PATH,
619+
script_not_exists=FIXTURES_PATH / "script_not_exists.sh",
620620
)
621621
sconfig = sconfig.import_config(yaml).get()
622622
sconfig = config.expand(sconfig)
@@ -639,11 +639,11 @@ def test_before_load_true_if_test_passes(server):
639639
config_script_completes = load_fixture(
640640
"workspacebuilder/config_script_completes.yaml"
641641
)
642-
script_complete_sh = fixtures_dir / "script_complete.sh"
642+
script_complete_sh = FIXTURES_PATH / "script_complete.sh"
643643
assert script_complete_sh.exists()
644644
sconfig = kaptan.Kaptan(handler="yaml")
645645
yaml = config_script_completes.format(
646-
fixtures_dir=fixtures_dir,
646+
fixtures_dir=FIXTURES_PATH,
647647
script_complete=script_complete_sh,
648648
)
649649

@@ -661,11 +661,11 @@ def test_before_load_true_if_test_passes_with_args(server):
661661
config_script_completes = load_fixture(
662662
"workspacebuilder/config_script_completes.yaml"
663663
)
664-
script_complete_sh = fixtures_dir / "script_complete.sh"
664+
script_complete_sh = FIXTURES_PATH / "script_complete.sh"
665665
assert script_complete_sh.exists()
666666
sconfig = kaptan.Kaptan(handler="yaml")
667667
yaml = config_script_completes.format(
668-
fixtures_dir=fixtures_dir, script_complete=script_complete_sh
668+
fixtures_dir=FIXTURES_PATH, script_complete=script_complete_sh
669669
)
670670

671671
sconfig = sconfig.import_config(yaml).get()

0 commit comments

Comments
 (0)