Normalise expected paths in windows tests
This commit is contained in:
parent
1e36811796
commit
52293ba948
1 changed files with 7 additions and 5 deletions
|
|
@ -53,13 +53,15 @@ def test_merge_patch(target, patch, outcome, err_if_enforce):
|
|||
@pytest.mark.parametrize(
|
||||
("base_conf", "resolves_to"),
|
||||
[
|
||||
("/var/base.json", "/var/base.json"),
|
||||
("base.json", "/var/openflexure/settings/base.json"),
|
||||
("./base.json", "/var/openflexure/settings/base.json"),
|
||||
("../base.json", "/var/openflexure/base.json"),
|
||||
("/var/base.json", os.path.normpath("/var/base.json")),
|
||||
("base.json", os.path.normpath("/var/openflexure/settings/base.json")),
|
||||
("./base.json", os.path.normpath("/var/openflexure/settings/base.json")),
|
||||
("../base.json", os.path.normpath("/var/openflexure/base.json")),
|
||||
(
|
||||
"$OFM_LIB/base.json",
|
||||
"/var/openflexure/application/openflexure-microscope-server/base.json",
|
||||
os.path.normpath(
|
||||
"/var/openflexure/application/openflexure-microscope-server/base.json"
|
||||
),
|
||||
),
|
||||
],
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue