Skip to content

Commit 55c362f

Browse files
committed
tests: changed tests for relative functions of the FilepathMixin so they are compatible with MacOS CI
1 parent d10bf6b commit 55c362f

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

tests/unit/test_registry.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
@dataclass
1717
class DummyRegistry(FilepathMixin):
1818
workdir: str
19+
path: str
1920
forecasts: dict = field(default_factory=dict)
2021
catalogs: dict = field(default_factory=dict)
2122

@@ -36,6 +37,7 @@ def setUp(self):
3637

3738
self.registry = DummyRegistry(
3839
workdir=self.tmpdir,
40+
path=self.tmpdir,
3941
forecasts={
4042
"2020-01-01_2020-01-02": "forecasts/f1.csv",
4143
"not_exists": "forecasts/does_not_exist.csv",
@@ -90,15 +92,14 @@ def test_abs_dir_returns_parent_directory(self):
9092

9193
def test_rel_returns_relpath_to_workdir(self):
9294
r = self.registry.rel("catalogs", "cat1", "eventlist.txt")
93-
self.assertEqual(
94-
r.resolve(), Path(os.path.relpath(self.eventlist, self.tmpdir)).resolve()
95-
)
95+
self.assertFalse(r.is_absolute())
96+
self.assertEqual((self.tmp_path / r).resolve(), self.eventlist.resolve())
9697
self.assertFalse(str(r).startswith(str(self.tmpdir)))
9798

9899
def test_rel_dir_returns_rel_directory(self):
99100
rdir = self.registry.rel_dir("catalogs", "cat1", "eventlist.txt")
100-
expected = Path(os.path.relpath(self.eventlist.parent, self.tmpdir))
101-
self.assertEqual(rdir.resolve(), expected.resolve())
101+
self.assertFalse(rdir.is_absolute())
102+
self.assertEqual((self.tmp_path / rdir).resolve(), self.eventlist.parent.resolve())
102103

103104
def test_get_attr_traverses_nested_mapping_and_returns_abs_path(self):
104105
p = self.registry.get_attr("forecasts", "2020-01-01_2020-01-02")

0 commit comments

Comments
 (0)