Skip to content

Commit 24980f2

Browse files
committed
rework tests
1 parent 6a158e1 commit 24980f2

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

xarray/tests/test_groupby.py

+16-14
Original file line numberDiff line numberDiff line change
@@ -1133,26 +1133,28 @@ def change_metadata(x):
11331133
expected = change_metadata(expected)
11341134
assert_equal(expected, actual)
11351135

1136-
def test_groupby_math(self):
1136+
@pytest.mark.parametrize("squeeze", [True, False])
1137+
def test_groupby_math_squeeze(self, squeeze):
11371138
array = self.da
1138-
for squeeze in [True, False]:
1139-
grouped = array.groupby("x", squeeze=squeeze)
1139+
grouped = array.groupby("x", squeeze=squeeze)
11401140

1141-
expected = array + array.coords["x"]
1142-
actual = grouped + array.coords["x"]
1143-
assert_identical(expected, actual)
1141+
expected = array + array.coords["x"]
1142+
actual = grouped + array.coords["x"]
1143+
assert_identical(expected, actual)
11441144

1145-
actual = array.coords["x"] + grouped
1146-
assert_identical(expected, actual)
1145+
actual = array.coords["x"] + grouped
1146+
assert_identical(expected, actual)
11471147

1148-
ds = array.coords["x"].to_dataset(name="X")
1149-
expected = array + ds
1150-
actual = grouped + ds
1151-
assert_identical(expected, actual)
1148+
ds = array.coords["x"].to_dataset(name="X")
1149+
expected = array + ds
1150+
actual = grouped + ds
1151+
assert_identical(expected, actual)
11521152

1153-
actual = ds + grouped
1154-
assert_identical(expected, actual)
1153+
actual = ds + grouped
1154+
assert_identical(expected, actual)
11551155

1156+
def test_groupby_math(self):
1157+
array = self.da
11561158
grouped = array.groupby("abc")
11571159
expected_agg = (grouped.mean(...) - np.arange(3)).rename(None)
11581160
actual = grouped - DataArray(range(3), [("abc", ["a", "b", "c"])])

0 commit comments

Comments
 (0)