Merge fixups

Author: rhshadrach

pandas/tests/groupby/aggregate/test_other.py

@@ -49,7 +49,7 @@ def peak_to_peak(arr):
     if get_option("future_udf_behavior"):
         match = "Dropping invalid columns in DataFrameGroupBy.agg"
     else:
-        match = (r"\['key2'\] did not aggregate successfully",)
+        match = r"\['key2'\] did not aggregate successfully"
 
     with tm.assert_produces_warning(
         FutureWarning,

pandas/tests/groupby/test_groupby.py

@@ -584,9 +584,11 @@ def test_frame_multi_key_function_list():
 
     grouped = data.groupby(["A", "B"])
     funcs = [np.mean, np.std]
-    with tm.assert_produces_warning(
-        FutureWarning, match=r"\['C'\] did not aggregate successfully"
-    ):
+    if get_option("future_udf_behavior"):
+        klass, msg = None, None
+    else:
+        klass, msg = FutureWarning, r"\['C'\] did not aggregate successfully"
+    with tm.assert_produces_warning(klass, match=msg):
         agged = grouped.agg(funcs)
     if get_option("future_udf_behavior"):
         expected = pd.concat(

pandas/tests/resample/test_resample_api.py

@@ -355,7 +355,10 @@ def test_agg():
         expected = pd.concat([a_mean, a_std, b_mean, b_std], axis=1)
         expected.columns = pd.MultiIndex.from_product([["A", "B"], ["mean", "std"]])
     for t in cases:
-        warn = FutureWarning if t in cases[1:3] else None
+        if t in cases[1:3] and not get_option("FUTURE_UDF_BEHAVIOR"):
+            warn = FutureWarning
+        else:
+            warn = None
         with tm.assert_produces_warning(
             warn,
             match=r"\['date'\] did not aggregate successfully",