Skip to content

Commit e3707f6

Browse files
committed
correct column mapping test
1 parent b2c40ef commit e3707f6

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

tests/e2e/pipeline_config/conftest.py

+2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ def test_dirs(tmp_path_factory):
4242
converted_resource_dir = tmp_path_factory.mktemp(
4343
"column_converted-resource", numbered=False
4444
)
45+
column_field_dir = tmp_path_factory.mktemp("column-field", numbered=False)
4546
output_log_dir = tmp_path_factory.mktemp("column_output_log", numbered=False)
4647

4748
output_dir = tmp_path_factory.mktemp("column_output", numbered=False)
@@ -86,6 +87,7 @@ def test_dirs(tmp_path_factory):
8687
"dataset_resource_dir": dataset_resource_dir,
8788
"converted_resource_dir": converted_resource_dir,
8889
"output_log_dir": output_log_dir,
90+
"column_field_dir": column_field_dir,
8991
}
9092

9193

tests/e2e/pipeline_config/test_column_mapping.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -142,19 +142,19 @@ def test_pipeline_run(test_dirs):
142142
operational_issue_dir=operational_issue_dir,
143143
organisation_path=organisation_path,
144144
save_harmonised=False,
145-
column_field_dir=pipeline_dir,
145+
column_field_dir=test_dirs["column_field_dir"],
146146
dataset_resource_dir=dataset_resource_dir,
147147
converted_resource_dir=converted_resource_dir,
148-
custom_temp_dir=None, # TBD: rename to "tmpdir"
149148
endpoints=test_endpoints,
150149
organisations=[],
151150
entry_date="",
152151
output_log_dir=output_log_dir,
153152
)
154153

155154
# -- Asert --
156-
output_file = output_path
157-
df = pd.read_csv(output_file, index_col=False)
155+
df = pd.read_csv(
156+
test_dirs["column_field_dir"] / f"{test_resource}.csv", index_col=False
157+
)
158158

159159
assert "end-date" in df["column"].values
160160
assert "ep-col-one" in df["column"].values

0 commit comments

Comments
 (0)