Fix CI

rth · rth · commit f96210ae5462 · 2018-05-07T18:13:45.000+03:00
diff --git a/sklearn/ensemble/tests/test_forest.py b/sklearn/ensemble/tests/test_forest.py
@@ -918,13 +918,13 @@ def check_1d_input(name, X, X_2d, y):
 
 
 @pytest.mark.parametrize('name', FOREST_ESTIMATORS)
-@ignore_warnings
 def test_1d_input(name):
     X = iris.data[:, 0]
     X_2d = iris.data[:, 0].reshape((-1, 1))
     y = iris.target
 
-    check_1d_input(name, X, X_2d, y)
+    with ignore_warnings():
+        check_1d_input(name, X, X_2d, y)
 
 
 def check_class_weights(name):
diff --git a/sklearn/mixture/tests/test_gmm.py b/sklearn/mixture/tests/test_gmm.py
@@ -162,9 +162,9 @@ def test_GMM_attributes():
     with pytest.raises(ValueError):
         g._set_covars([])
     with pytest.raises(ValueError):
-        g._set_covars( np.zeros((n_components - 2, n_features)))
+        g._set_covars(np.zeros((n_components - 2, n_features)))
     with pytest.raises(ValueError):
-        mixture.GMM( n_components=20, covariance_type='badcovariance_type')
+        mixture.GMM(n_components=20, covariance_type='badcovariance_type')
 
 
 class GMMTester():
diff --git a/sklearn/utils/testing.py b/sklearn/utils/testing.py
@@ -697,32 +697,27 @@ def run_test(*args, **kwargs):
                                  reason='skip on travis')
 
 
-def if_safe_multiprocessing_with_blas(func):
-    """Decorator for tests involving both BLAS calls and multiprocessing.
-
-    Under POSIX (e.g. Linux or OSX), using multiprocessing in conjunction with
-    some implementation of BLAS (or other libraries that manage an internal
-    posix thread pool) can cause a crash or a freeze of the Python process.
-
-    In practice all known packaged distributions (from Linux distros or
-    Anaconda) of BLAS under Linux seems to be safe. So we this problem seems to
-    only impact OSX users.
-
-    This wrapper makes it possible to skip tests that can possibly cause
-    this crash under OS X with.
-
-    Under Python 3.4+ it is possible to use the `forkserver` start method
-    for multiprocessing to avoid this issue. However it can cause pickling
-    errors on interactively defined functions. It therefore not enabled by
-    default.
-    """
-    @wraps(func)
-    def run_test(*args, **kwargs):
-        if sys.platform == 'darwin':
-            raise SkipTest(
-                "Possible multi-process bug with some BLAS")
-        return func(*args, **kwargs)
-    return run_test
+#  Decorator for tests involving both BLAS calls and multiprocessing.
+#
+#  Under POSIX (e.g. Linux or OSX), using multiprocessing in conjunction with
+#  some implementation of BLAS (or other libraries that manage an internal
+#  posix thread pool) can cause a crash or a freeze of the Python process.
+#
+#  In practice all known packaged distributions (from Linux distros or
+#  Anaconda) of BLAS under Linux seems to be safe. So we this problem seems to
+#  only impact OSX users.
+#
+#  This wrapper makes it possible to skip tests that can possibly cause
+#  this crash under OS X with.
+#
+#  Under Python 3.4+ it is possible to use the `forkserver` start method
+#  for multiprocessing to avoid this issue. However it can cause pickling
+#  errors on interactively defined functions. It therefore not enabled by
+#  default.
+
+if_safe_multiprocessing_with_blas = pytest.mark.skipif(
+        sys.platform == 'darwin',
+        reason="Possible multi-process bug with some BLAS")
 
 
 def clean_warning_registry():
diff --git a/sklearn/utils/tests/test_stats.py b/sklearn/utils/tests/test_stats.py
@@ -14,8 +14,10 @@
 )
 
 
-@ignore_warnings  # Test deprecated backport to be removed in 0.21
 @pytest.mark.parametrize("values, method, expected", _cases)
 def test_cases_rankdata(values, method, expected):
-    r = rankdata(values, method=method)
-    assert_array_equal(r, expected)
+
+    # Test deprecated backport to be removed in 0.21
+    with ignore_warnings():
+        r = rankdata(values, method=method)
+        assert_array_equal(r, expected)
