Skip to content

Commit c59521a

Browse files
committed
Try fix windows test
1 parent 4b2c802 commit c59521a

6 files changed

Lines changed: 15 additions & 14 deletions

File tree

tests/test_bespoke.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,8 +1754,8 @@ def test_cli(runner, clear_loggers):
17541754
assert "bespoke_config_fp" in f.h5.attrs
17551755
assert "bespoke_config" in f.h5.attrs
17561756

1757-
config_fp = str(Path(config_path).expanduser().resolve())
1758-
assert f.h5.attrs["bespoke_config_fp"] == config_fp
1757+
config_fp = Path(config_path).expanduser().resolve()
1758+
assert Path(f.h5.attrs["bespoke_config_fp"]) == config_fp
17591759
assert f.h5.attrs["bespoke_config"] == json.dumps(config)
17601760

17611761
clear_loggers()

tests/test_econ_lcoe.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,8 @@ def test_econ_from_config(runner, clear_loggers):
234234

235235
assert "econ_config_fp" in f.h5.attrs
236236
assert "econ_config" in f.h5.attrs
237-
config_fp = str(Path(config_path).expanduser().resolve())
238-
assert f.h5.attrs['econ_config_fp'] == config_fp
237+
config_fp = Path(config_path).expanduser().resolve()
238+
assert Path(f.h5.attrs['econ_config_fp']) == config_fp
239239
assert f.h5.attrs['econ_config'] == json.dumps(config)
240240

241241
with h5py.File(r1f, mode='r') as f:

tests/test_gen_config.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,9 @@ def test_gen_from_config(runner, tech, clear_loggers):
116116

117117
assert "generation_config_fp" in cf.h5.attrs
118118
assert "generation_config" in cf.h5.attrs
119-
config_fp = str(Path(config_path).expanduser().resolve())
120-
assert cf.h5.attrs["generation_config_fp"] == config_fp
119+
config_fp = Path(config_path).expanduser().resolve()
120+
assert (Path(cf.h5.attrs["generation_config_fp"])
121+
== config_fp)
121122
assert (json.loads(cf.h5.attrs["generation_config"])
122123
== config)
123124

tests/test_handlers_multiyear.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,8 @@ def test_cli(runner, clear_loggers):
209209
assert "multi-year_config_fp" in res.h5.attrs
210210
assert "multi-year_config" in res.h5.attrs
211211

212-
config_fp = str(Path(fp_config).expanduser().resolve())
213-
assert res.h5.attrs["multi-year_config_fp"] == config_fp
212+
config_fp = Path(fp_config).expanduser().resolve()
213+
assert Path(res.h5.attrs["multi-year_config_fp"]) == config_fp
214214
assert res.h5.attrs["multi-year_config"] == json.dumps(config)
215215

216216
assert "multi-year_source_files" in res.h5.attrs
@@ -283,8 +283,8 @@ def test_cli_single_file(runner, clear_loggers):
283283
assert "multi-year_config_fp" in res.h5.attrs
284284
assert "multi-year_config" in res.h5.attrs
285285

286-
config_fp = str(Path(fp_config).expanduser().resolve())
287-
assert res.h5.attrs["multi-year_config_fp"] == config_fp
286+
config_fp = Path(fp_config).expanduser().resolve()
287+
assert Path(res.h5.attrs["multi-year_config_fp"]) == config_fp
288288
assert res.h5.attrs["multi-year_config"] == json.dumps(config)
289289

290290
assert "multi-year_source_files" in res.h5.attrs

tests/test_hybrids.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -821,8 +821,8 @@ def test_hybrids_cli_from_config(
821821
assert f.h5.attrs["solar_fpath"] == sfp
822822
assert f.h5.attrs["wind_fpath"] == wfp
823823

824-
config_fp = str(Path(config_path).expanduser().resolve())
825-
assert f.h5.attrs["hybrids_config_fp"] == config_fp
824+
config_fp = Path(config_path).expanduser().resolve()
825+
assert Path(f.h5.attrs["hybrids_config_fp"]) == config_fp
826826
assert json.loads(f.h5.attrs["hybrids_config"]) == config
827827

828828
clear_loggers()

tests/test_rep_profiles.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,8 +418,8 @@ def test_rep_profiles_cli(runner, clear_loggers):
418418

419419
assert res.h5.attrs["gen_fpath"] == GEN_FPATH
420420

421-
config_fp = str(Path(config_path).expanduser().resolve())
422-
assert res.h5.attrs["rep-profiles_config_fp"] == config_fp
421+
config_fp = Path(config_path).expanduser().resolve()
422+
assert Path(res.h5.attrs["rep-profiles_config_fp"]) == config_fp
423423
assert json.loads(res.h5.attrs["rep-profiles_config"]) == config
424424

425425
assert np.issubdtype(dtype, np.integer)

0 commit comments

Comments
 (0)