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

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
tests(conf): Refactor tmpdir -> tmp_path
  • Loading branch information
@tony
tony committed Mar 13, 2022
commit 8f057fd668a31b9841b59b0e1ab9a97be15ae197
40 changes: 22 additions & 18 deletions tests/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""Test for tmuxp configuration import, inlining, expanding and export."""
import os
import pathlib

import pytest

Expand All @@ -10,7 +11,7 @@
from . import example_dir
from .fixtures import config as fixtures

TMUXP_DIR = os.path.join(os.path.dirname(__file__), ".tmuxp")
TMUXP_DIR = pathlib.Path(__file__).parent / ".tmuxp"


def load_yaml(yaml):
Expand All @@ -21,58 +22,61 @@ def load_config(_file):
return kaptan.Kaptan().import_config(_file).get()


def test_export_json(tmpdir):
json_config_file = tmpdir.join("config.json")
def test_export_json(tmp_path: pathlib.Path):
json_config_file = tmp_path / "config.json"

configparser = kaptan.Kaptan()
configparser.import_config(fixtures.sampleconfig.sampleconfigdict)

json_config_data = configparser.export("json", indent=2)

json_config_file.write(json_config_data)
json_config_file.write_text(json_config_data, encoding="utf-8")

new_config = kaptan.Kaptan()
new_config_data = new_config.import_config(str(json_config_file)).get()
assert fixtures.sampleconfig.sampleconfigdict == new_config_data


def test_export_yaml(tmpdir):
yaml_config_file = tmpdir.join("config.yaml")
def test_export_yaml(tmp_path: pathlib.Path):
yaml_config_file = tmp_path / "config.yaml"

configparser = kaptan.Kaptan()
sampleconfig = config.inline(fixtures.sampleconfig.sampleconfigdict)
configparser.import_config(sampleconfig)

yaml_config_data = configparser.export("yaml", indent=2, default_flow_style=False)

yaml_config_file.write(yaml_config_data)
yaml_config_file.write_text(yaml_config_data, encoding="utf-8")

new_config_data = load_config(str(yaml_config_file))
assert fixtures.sampleconfig.sampleconfigdict == new_config_data


def test_scan_config(tmpdir):
def test_scan_config(tmp_path: pathlib.Path):
configs = []

garbage_file = tmpdir.join("config.psd")
garbage_file.write("wat")
garbage_file = tmp_path / "config.psd"
garbage_file.write_text("wat", encoding="utf-8")

for r, d, f in os.walk(str(tmpdir)):
for r, d, f in os.walk(str(tmp_path)):
for filela in (x for x in f if x.endswith((".json", ".ini", "yaml"))):
configs.append(str(tmpdir.join(filela)))
configs.append(str(tmp_path / filela))

files = 0
if tmpdir.join("config.json").check():
config_json = tmp_path / "config.json"
config_yaml = tmp_path / "config.yaml"
config_ini = tmp_path / "config.ini"
if config_json.exists():
files += 1
assert str(tmpdir.join("config.json")) in configs
assert str(config_json) in configs

if tmpdir.join("config.yaml").check():
if config_yaml.exists():
files += 1
assert str(tmpdir.join("config.yaml")) in configs
assert str(config_yaml) in configs

if tmpdir.join("config.ini").check():
if config_ini.exists():
files += 1
assert str(tmpdir.join("config.ini")) in configs
assert str(config_ini) in configs

assert len(configs) == files

Expand Down