left-over deprecation of 1d X (scikit-learn#8045)

amueller · NelleV · commit ca2b55b73099 · 2017-08-11T09:31:30.000-07:00
diff --git a/sklearn/utils/estimator_checks.py b/sklearn/utils/estimator_checks.py
@@ -30,7 +30,6 @@
 from sklearn.utils.testing import assert_greater_equal
 from sklearn.utils.testing import SkipTest
 from sklearn.utils.testing import ignore_warnings
-from sklearn.utils.testing import assert_warns
 from sklearn.utils.testing import assert_dict_equal
 
 
@@ -488,11 +487,8 @@ def check_fit2d_predict1d(name, Estimator):
     for method in ["predict", "transform", "decision_function",
                    "predict_proba"]:
         if hasattr(estimator, method):
-            try:
-                assert_warns(DeprecationWarning,
-                             getattr(estimator, method), X[0])
-            except ValueError:
-                pass
+            assert_raise_message(ValueError, "Reshape your data",
+                                 getattr(estimator, method), X[0])
 
 
 @ignore_warnings
