Skip to content

define pytest logs location #483

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

Closed
hussain-jafari wants to merge 10 commits into from
Closed

define pytest logs location #483

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9f93c13
define log path
hussain-jafari Jan 22, 2025
a810c84
name changes
Jan 23, 2025
817099d
only define outermost dir in conftest
hussain-jafari Jan 23, 2025
7dd5996
update fixture scope
Jan 23, 2025
440bd32
revert using test_dir
hussain-jafari Jan 23, 2025
decb88f
go back to profiling noised data
hussain-jafari Jan 23, 2025
5a6adcb
some linting
hussain-jafari Jan 23, 2025
8fd5dc7
add type annotation
hussain-jafari Jan 23, 2025
c5f96a1
use release_output_dir name
hussain-jafari Jan 23, 2025
f3768f3
lint
hussain-jafari Jan 23, 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
11 changes: 4 additions & 7 deletions tests/integration/release/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,11 @@ def pytest_addoption(parser: pytest.Parser) -> None:
############
# Fixtures #
############
@pytest.fixture(scope="session")
@pytest.fixture(scope="module")
def release_output_dir() -> Path:
# TODO: [MIC-5522] define correct output dir
# output_dir = os.environ.get("PSP_TEST_OUTPUT_DIR")
output_dir_name = (
"/mnt/team/simulation_science/priv/engineering/pseudopeople_release_testing"
"/mnt/team/simulation_science/priv/engineering/pseudopeople_release_testing/"
)
# if not output_dir_name:
# raise ValueError("PSP_TEST_OUTPUT_DIR environment variable not set")
output_dir = Path(output_dir_name) / f"{time.strftime('%Y%m%d_%H%M%S')}"
output_dir.mkdir(parents=True, exist_ok=False)
return output_dir.resolve()
Expand Down Expand Up @@ -154,7 +150,8 @@ def noised_data(
}
if dataset_func != generate_social_security:
kwargs["state"] = state
noised_data = profile_data_generation(release_output_dir)(dataset_func)(**kwargs)
profiling_dir = release_output_dir / "profiling"
noised_data = profile_data_generation(profiling_dir)(dataset_func)(**kwargs)
if engine == "dask":
# mypy expects noised_data to be a series rather than dask object
noised_data = noised_data.compute() # type: ignore [operator]
Expand Down
15 changes: 12 additions & 3 deletions tests/integration/release/test_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,22 @@
(["--dataset", "wic", "--year", "2015"]),
# (["--dataset", "wic", "--population", "USA", "--state", "RI", "--year", "2015"]),
],
ids=["1", "2", "3", "4"],
Copy link
Contributor Author

@hussain-jafari hussain-jafari Jan 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All the changes in this life will eventually be the responsibility of jobmon, so these are just here as a placeholder for testing.

)
def test_release_tests(pytest_args: list[str]) -> None:
def test_release_tests(
pytest_args: list[str], release_output_dir: Path, request: pytest.FixtureRequest
) -> None:
os.chdir(Path(__file__).parent) # need this to access cli options from conftest.py
base_cmd = ["pytest", "--release", "test_release.py"]
cmd = base_cmd + pytest_args
result = subprocess.run(cmd, capture_output=True, text=True)
assert result.returncode == 0

# log using job id
job_id = request.node.callspec.id
log_dir = release_output_dir / "logs"
log_dir.mkdir(parents=True, exist_ok=True)
log_file = log_dir / f"pytest_{job_id}.o"
with open(log_file, "w") as file:
subprocess.run(cmd, stdout=file)


@pytest.mark.parametrize("dataset", ["acs", "cps"])
Expand Down
Loading