TST Fixes test (Will fail now on CI)

thomasjpfan · thomasjpfan · commit 3c1d57f252d6 · 2021-11-27T09:49:51.000-05:00
diff --git a/sklearn/tests/test_common.py b/sklearn/tests/test_common.py
@@ -337,10 +337,8 @@ def _estimators_that_predict_in_fit():
         est_params = set(estimator.get_params())
         if "oob_score" in est_params:
             yield estimator.set_params(oob_score=True, bootstrap=True)
-        elif "n_iter_no_change" in est_params:
-            yield estimator.set_params(n_iter_no_change=1)
         elif "early_stopping" in est_params:
-            yield estimator.set_params(early_stopping=True)
+            yield estimator.set_params(early_stopping=True, n_iter_no_change=1)
 
 
 # NOTE: When running `check_dataframe_column_names_consistency` on a meta-estimator that
diff --git a/sklearn/utils/estimator_checks.py b/sklearn/utils/estimator_checks.py
@@ -3862,6 +3862,12 @@ def check_dataframe_column_names_consistency(name, estimator_orig):
             f"Feature names seen at fit time, yet now missing:\n- {min(names[3:])}\n",
         ),
     ]
+    params = {
+        key: value
+        for key, value in estimator.get_params().items()
+        if "early_stopping" in key
+    }
+    early_stopping_enabled = any(value is True for value in params.values())
 
     for invalid_name, additional_message in invalid_names:
         X_bad = pd.DataFrame(X, columns=invalid_name)
@@ -3885,7 +3891,8 @@ def check_dataframe_column_names_consistency(name, estimator_orig):
                     method(X_bad)
 
         # partial_fit checks on second call
-        if not hasattr(estimator, "partial_fit"):
+        # Do not call partial fit if early_stopping is on
+        if not hasattr(estimator, "partial_fit") or early_stopping_enabled:
             continue
 
         estimator = clone(estimator_orig)
