From f62d3511f8cd3f2a9ce72bdbbfcf58ba1d752376 Mon Sep 17 00:00:00 2001 From: Tom White Date: Mon, 23 Sep 2024 09:36:26 +0100 Subject: [PATCH 1/2] Remove xfail for test_chunk due to Cubed #546 fix --- cubed_xarray/tests/test_xarray.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cubed_xarray/tests/test_xarray.py b/cubed_xarray/tests/test_xarray.py index 55663d1..d161140 100644 --- a/cubed_xarray/tests/test_xarray.py +++ b/cubed_xarray/tests/test_xarray.py @@ -86,9 +86,6 @@ def test_copy(self): self.assertLazyAndIdentical(self.eager_var, self.lazy_var.copy()) self.assertLazyAndIdentical(self.eager_var, self.lazy_var.copy(deep=True)) - @pytest.mark.xfail( - reason="cubed rechunk handles chunks={} incorrectly, see https://github.com/cubed-dev/cubed/pull/546" - ) def test_chunk(self): for chunks, expected in [ ({}, ((2, 2), (2, 2, 2))), @@ -292,9 +289,6 @@ def setUp(self): self.data, coords={"x": range(4)}, dims=("x", "y"), name="foo" ) - @pytest.mark.xfail( - reason="cubed rechunk handles chunks={} incorrectly, see https://github.com/cubed-dev/cubed/pull/546" - ) def test_chunk(self) -> None: for chunks, expected in [ ({}, ((2, 2), (2, 2, 2))), From 39921add76bdbb248f3af2f72d2af93f118ade86 Mon Sep 17 00:00:00 2001 From: Tom White Date: Mon, 23 Sep 2024 09:42:05 +0100 Subject: [PATCH 2/2] Remove xfail for test_unary_op (round) due to Xarray #9326 fix --- cubed_xarray/tests/test_xarray.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cubed_xarray/tests/test_xarray.py b/cubed_xarray/tests/test_xarray.py index d161140..ac85e68 100644 --- a/cubed_xarray/tests/test_xarray.py +++ b/cubed_xarray/tests/test_xarray.py @@ -148,7 +148,7 @@ def test_unary_op(self): v = self.lazy_var self.assertLazyAndIdentical(-u, -v) self.assertLazyAndIdentical(abs(u), abs(v)) - # self.assertLazyAndIdentical(u.round(), v.round()) # TODO: fails, see https://github.com/pydata/xarray/pull/9326 + self.assertLazyAndIdentical(u.round(), v.round()) def test_binary_op(self): u = self.eager_var