rename var names.

Author: dcherian

xarray/tests/test_concat.py

@@ -291,18 +291,18 @@ class TestConcatDatasetNewApi:
     def setUp(self):
         self.ds1 = Dataset(
             {
-                "has_x_y": (("y", "x"), [[1, 2]]),
-                "has_x": ("x", [1, 2]),
-                "no_x_y": ("z", [1, 2]),
+                "only_x_y": (("y", "x"), [[1, 2]]),
+                "only_x": ("x", [1, 2]),
+                "only_z": ("z", [1, 2]),
                 "const1": 1.0,
             },
             coords={"x": [0, 1], "y": [0], "z": [-1, -2], "coord1": ("x", [0, 1])},
         )
         self.ds2 = Dataset(
             {
-                "has_x_y": (("y", "x"), [[3, 4]]),
-                "has_x": ("x", [1.1, 2.1]),
-                "no_x_y": ("z", [1, 2]),
+                "only_x_y": (("y", "x"), [[3, 4]]),
+                "only_x": ("x", [1.1, 2.1]),
+                "only_z": ("z", [1, 2]),
                 "const1": 1.0,
             },
             coords={
@@ -315,22 +315,22 @@ def setUp(self):
 
         self.expected_y = Dataset(
             {
-                "has_x_y": (("y", "x"), [[1, 2], [3, 4]]),
-                "has_x": ("x", [1, 2]),
-                "no_x_y": ("z", [1, 2]),
+                "only_x_y": (("y", "x"), [[1, 2], [3, 4]]),
+                "only_x": ("x", [1, 2]),
+                "only_z": ("z", [1, 2]),
                 "const1": 1.0,
             },
             coords={"x": [0, 1], "y": [0, 1], "z": [-1, -2], "coord1": ("x", [0, 1])},
         )
 
         self.expected_new_dim = Dataset(
             {
-                "has_x_y": (
+                "only_x_y": (
                     ("new_dim", "y", "x"),
                     [[[1, 2], [np.nan, np.nan]], [[np.nan, np.nan], [3, 4]]],
                 ),
-                "has_x": (("new_dim", "x"), [[1, 2], [1.1, 2.1]]),
-                "no_x_y": (("new_dim", "z"), [[1, 2], [1, 2]]),
+                "only_x": (("new_dim", "x"), [[1, 2], [1.1, 2.1]]),
+                "only_z": (("new_dim", "z"), [[1, 2], [1, 2]]),
                 "const1": ("new_dim", [1.0, 1.0]),
             },
             coords={
@@ -345,7 +345,7 @@ def setUp(self):
 
     def test_concat_sensible_compat_errors(self):
 
-        with raises_regex(ValueError, "'has_x' is not equal across datasets."):
+        with raises_regex(ValueError, "'only_x' is not equal across datasets."):
             concat(self.dsets, data_vars="sensible", dim="y")
 
         with raises_regex(ValueError, "'coord1' is not equal across datasets."):
@@ -378,15 +378,15 @@ def test_compat_override(self, data_vars, coords):
         )
 
         if data_vars == "all":
-            expected_y_dim = ["has_x_y", "has_x", "no_x_y", "const1"]
+            expected_y_dim = ["only_x_y", "only_x", "only_z", "const1"]
             equal_to_first_ds = []
         elif data_vars == "sensible":
-            expected_y_dim = ["has_x_y"]
+            expected_y_dim = ["only_x_y"]
             if coords == "all":
-                # in this case, variable has_x will not have coord1 as non-dim coord
-                equal_to_first_ds = ["no_x_y", "const1"]
+                # in this case, variable only_x will not have coord1 as non-dim coord
+                equal_to_first_ds = ["only_z", "const1"]
             if coords == "sensible":
-                equal_to_first_ds = ["has_x", "no_x_y", "const1"]
+                equal_to_first_ds = ["only_x", "only_z", "const1"]
 
         if coords == "all":
             expected_y_dim += ["coord1"]