Skip to content
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

Small improvements to config_paths fixture #86

Merged
merged 2 commits into from
Jan 16, 2025
Merged

Small improvements to config_paths fixture #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a0001a
Rename all test config files to `config.yml`
agoscinski Jan 12, 2025
d59e244
Move logic from `config_paths` fixture to function
agoscinski Jan 12, 2025
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
0 .../cases/large/config/test_config_large.yml → tests/cases/large/config/config.yml
View file
Open in desktop
File renamed without changes.
0 tests/cases/large/data/test_config_large.txt → tests/cases/large/data/config.txt
View file
Open in desktop
File renamed without changes.
0 ...ameters/config/test_config_parameters.yml → tests/cases/parameters/config/config.yml
View file
Open in desktop
File renamed without changes.
0 ...arameters/data/test_config_parameters.txt → tests/cases/parameters/data/config.txt
View file
Open in desktop
File renamed without changes.
0 .../cases/small/config/test_config_small.yml → tests/cases/small/config/config.yml
View file
Open in desktop
File renamed without changes.
0 tests/cases/small/data/test_config_small.txt → tests/cases/small/data/config.txt
View file
Open in desktop
File renamed without changes.
43 changes: 15 additions & 28 deletions tests/test_wc_workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,21 @@ def pprinter():
return PrettyPrinter()


def generate_config_paths(test_case: str):
return {
"yml": Path(f"tests/cases/{test_case}/config/config.yml"),
"txt": Path(f"tests/cases/{test_case}/data/config.txt"),
"svg": Path(f"tests/cases/{test_case}/svg/config.svg"),
}


# configs that are tested for parsing
config_test_files = [
"tests/cases/small/config/test_config_small.yml",
"tests/cases/large/config/test_config_large.yml",
"tests/cases/parameters/config/test_config_parameters.yml",
]
all_uses_cases = ["small", "parameters", "large"]


@pytest.fixture(params=config_test_files)
@pytest.fixture(params=all_uses_cases)
def config_paths(request):
config_path = Path(request.param)
return {
"yml": config_path,
"txt": (config_path.parent.parent / "data" / config_path.name).with_suffix(".txt"),
"svg": (config_path.parent.parent / "svg" / config_path.name).with_suffix(".svg"),
}
return generate_config_paths(request.param)


def test_parse_config_file(config_paths, pprinter):
Expand All @@ -73,8 +72,8 @@ def test_vizgraph(config_paths):
@pytest.mark.parametrize(
"config_path",
[
"tests/cases/small/config/test_config_small.yml",
"tests/cases/parameters/config/test_config_parameters.yml",
"tests/cases/small/config/config.yml",
"tests/cases/parameters/config/config.yml",
],
)
def test_run_workgraph(config_path, aiida_computer):
Expand All @@ -95,13 +94,7 @@ def test_run_workgraph(config_path, aiida_computer):
# configs containing task using icon plugin
@pytest.mark.parametrize(
"config_paths",
[
{
"yml": Path("tests/cases/large/config/test_config_large.yml"),
"txt": Path("tests/cases/large/data/test_config_large.txt"),
"svg": Path("tests/cases/large/svg/test_config_large.svg"),
}
],
[generate_config_paths("large")],
)
def test_nml_mod(config_paths, tmp_path):
nml_refdir = config_paths["txt"].parent / "ICON_namelists"
Expand All @@ -124,13 +117,7 @@ def test_nml_mod(config_paths, tmp_path):
# configs containing task using icon plugin
@pytest.mark.parametrize(
"config_paths",
[
{
"yml": Path("tests/cases/large/config/test_config_large.yml"),
"txt": Path("tests/cases/large/data/test_config_large.txt"),
"svg": Path("tests/cases/large/svg/test_config_large.svg"),
}
],
[generate_config_paths("large")],
)
def test_serialize_nml(config_paths):
nml_refdir = config_paths["txt"].parent / "ICON_namelists"
Expand Down
Loading