Skip to content

Commit a90443a

Browse files
author
Hussain Jafari
committed
change where some default parameters are defined
1 parent fc5dc6c commit a90443a

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

tests/integration/release/conftest.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,13 @@ def pytest_addoption(parser: pytest.Parser) -> None:
6363
parser.addoption(
6464
"--output-dir",
6565
action="store",
66+
default=CLI_DEFAULT_OUTPUT_DIR,
6667
help=f"The output directory to write to. Defaults to {CLI_DEFAULT_OUTPUT_DIR}.",
6768
)
6869
parser.addoption(
6970
"--dataset",
7071
action="store",
72+
default=CLI_DEFAULT_DATASET,
7173
help="The dataset to generate. Options are 'census', 'acs', 'cps', 'ssa', 'tax_w2_1099', 'wic', and 'tax_1040'. No argument will default to acs.",
7274
)
7375
parser.addoption(
@@ -96,8 +98,8 @@ def pytest_addoption(parser: pytest.Parser) -> None:
9698
# Fixtures #
9799
############
98100
@pytest.fixture(scope="session")
99-
def release_output_dir(request: pytest.FixtureRequest) -> Path | None:
100-
output_dir_name = request.config.getoption("--output-dir", default=CLI_DEFAULT_OUTPUT_DIR)
101+
def release_output_dir(request: pytest.FixtureRequest) -> Path:
102+
output_dir_name = request.config.getoption("--output-dir")
101103
output_dir = Path(output_dir_name) / f"{time.strftime('%Y%m%d_%H%M%S')}"
102104
output_dir.mkdir(parents=True, exist_ok=False)
103105
return output_dir.resolve()
@@ -107,7 +109,7 @@ def release_output_dir(request: pytest.FixtureRequest) -> Path | None:
107109
def dataset_params(
108110
request: pytest.FixtureRequest,
109111
) -> tuple[str | int | Callable[..., pd.DataFrame] | None, ...]:
110-
dataset_name = request.config.getoption("--dataset", default=CLI_DEFAULT_DATASET)
112+
dataset_name = request.config.getoption("--dataset")
111113
try:
112114
dataset_func = DATASET_GENERATION_FUNCS[dataset_name]
113115
except KeyError:

0 commit comments

Comments
 (0)