scikit-learn · rth · Mar 4, 2020 · Jan 31, 2020 · Jan 31, 2020 · Jan 31, 2020
diff --git a/sklearn/datasets/tests/conftest.py b/sklearn/datasets/tests/conftest.py
@@ -1,5 +1,6 @@
 """ Network tests are only run, if data is already locally available,
 or if download is specifically requested by environment variable."""
+import builtins
 from os import environ
 import pytest
 from sklearn.datasets import fetch_20newsgroups
@@ -59,3 +60,16 @@ def fetch_olivetti_faces_fxt():
 @pytest.fixture
 def fetch_rcv1_fxt():
     return _wrapped_fetch(fetch_rcv1, dataset_name='rcv1')
+
+
+@pytest.fixture
+def hide_available_pandas(monkeypatch):
+    """ Pretend pandas was not installed. """
+    import_orig = builtins.__import__
+
+    def mocked_import(name, *args, **kwargs):
+        if name == 'pandas':
+            raise ImportError()
+        return import_orig(name, *args, **kwargs)
+
+    monkeypatch.setattr(builtins, '__import__', mocked_import)
diff --git a/sklearn/datasets/tests/test_california_housing.py b/sklearn/datasets/tests/test_california_housing.py
@@ -27,14 +27,11 @@ def test_fetch_asframe(fetch_california_housing_fxt):
     assert isinstance(bunch.target, pd.Series)
 
 
-def test_pandas_dependency_message(fetch_california_housing_fxt):
-    try:
-        import pandas  # noqa
-        pytest.skip("This test requires pandas to be not installed")
-    except ImportError:
-        # Check that pandas is imported lazily and that an informative error
-        # message is raised when pandas is missing:
-        expected_msg = ('fetch_california_housing with as_frame=True'
-                        ' requires pandas')
-        with pytest.raises(ImportError, match=expected_msg):
-            fetch_california_housing_fxt(as_frame=True)
+def test_pandas_dependency_message(fetch_california_housing_fxt,
+                                   hide_available_pandas):
+    # Check that pandas is imported lazily and that an informative error
+    # message is raised when pandas is missing:
+    expected_msg = ('fetch_california_housing with as_frame=True'
+                    ' requires pandas')
+    with pytest.raises(ImportError, match=expected_msg):
+        fetch_california_housing_fxt(as_frame=True)