Fix combine tests.

pydata · Aug 14, 2019 · 7afbe51 · 7afbe51
1 parent 4f3c488
commit 7afbe51
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/xarray/core/combine.py b/xarray/core/combine.py
@@ -243,12 +243,11 @@ def _combine_1d(
                 dim=concat_dim,
                 data_vars=data_vars,
                 coords=coords,
-                compat=compat,
                 fill_value=fill_value,
                 join=join,
             )
         except ValueError as err:
-            if "encountered unexpected variable" in str(err):
+            if "Encountered unexpected variable" in str(err):
                 raise ValueError(
                     "These objects cannot be combined using only "
                     "xarray.combine_nested, instead either use "
@@ -825,7 +824,6 @@ def _old_auto_combine(
                 dim=dim,
                 data_vars=data_vars,
                 coords=coords,
-                compat=compat,
                 fill_value=fill_value,
                 join=join,
             )
@@ -844,7 +842,7 @@ def _auto_concat(
     coords="different",
     fill_value=dtypes.NA,
     join="outer",
-    compat="no_conflicts"
+    compat="equals",
 ):
     if len(datasets) == 1 and dim is None:
         # There is nothing more to combine, so kick out early.
@@ -871,6 +869,10 @@ def _auto_concat(
                 )
             dim, = concat_dims
         return concat(
-            datasets, dim=dim, data_vars=data_vars, coords=coords, fill_value=fill_value,
-            compat=compat
+            datasets,
+            dim=dim,
+            data_vars=data_vars,
+            coords=coords,
+            fill_value=fill_value,
+            compat=compat,
         )