Skip to content

Commit 61bfe8a

Browse files
committed
make more explicit which checks are run
1 parent db56cf4 commit 61bfe8a

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

sklearn/tests/test_common.py

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
check_class_weight_balanced_linear_classifier,
3434
check_transformer_n_iter,
3535
check_non_transformer_estimators_n_iter,
36-
check_get_params_invariance)
36+
check_get_params_invariance,
37+
_set_test_name)
3738

3839

3940
def test_all_estimator_no_base_class():
@@ -55,7 +56,7 @@ def test_all_estimators():
5556

5657
for name, Estimator in estimators:
5758
# some can just not be sensibly default constructed
58-
yield check_parameters_default_constructible, name, Estimator
59+
yield _set_test_name(check_parameters_default_constructible, name), name, Estimator
5960

6061

6162
def test_non_meta_estimators():
@@ -70,9 +71,9 @@ def test_non_meta_estimators():
7071
if issubclass(Estimator, ProjectedGradientNMF):
7172
# The ProjectedGradientNMF class is deprecated
7273
with ignore_warnings():
73-
yield check, name, Estimator
74+
yield _set_test_name(check, name), name, Estimator
7475
else:
75-
yield check, name, Estimator
76+
yield _set_test_name(check, name), name, Estimator
7677

7778

7879
def test_configure():
@@ -114,7 +115,7 @@ def test_class_weight_balanced_linear_classifiers():
114115
issubclass(clazz, LinearClassifierMixin))]
115116

116117
for name, Classifier in linear_classifiers:
117-
yield check_class_weight_balanced_linear_classifier, name, Classifier
118+
yield _set_test_name(check_class_weight_balanced_linear_classifier, name), name, Classifier
118119

119120

120121
@ignore_warnings
@@ -196,7 +197,7 @@ def test_non_transformer_estimators_n_iter():
196197
else:
197198
# Multitask models related to ENet cannot handle
198199
# if y is mono-output.
199-
yield (check_non_transformer_estimators_n_iter,
200+
yield (_set_test_name(check_non_transformer_estimators_n_iter, name),
200201
name, estimator, 'Multi' in name)
201202

202203

@@ -218,9 +219,10 @@ def test_transformer_n_iter():
218219
if isinstance(estimator, ProjectedGradientNMF):
219220
# The ProjectedGradientNMF class is deprecated
220221
with ignore_warnings():
221-
yield check_transformer_n_iter, name, estimator
222+
yield _set_test_name(check_transformer_n_iter, name), name, estimator
222223
else:
223-
yield check_transformer_n_iter, name, estimator
224+
yield _set_test_name(check_transformer_n_iter, name), name, estimator
225+
224226

225227
def test_get_params_invariance():
226228
# Test for estimators that support get_params, that
@@ -234,6 +236,6 @@ def test_get_params_invariance():
234236
# If class is deprecated, ignore deprecated warnings
235237
if hasattr(Estimator.__init__, "deprecated_original"):
236238
with ignore_warnings():
237-
yield check_get_params_invariance, name, Estimator
239+
yield _set_test_name(check_get_params_invariance, name), name, Estimator
238240
else:
239-
yield check_get_params_invariance, name, Estimator
241+
yield _set_test_name(check_get_params_invariance, name), name, Estimator

sklearn/utils/estimator_checks.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@
7575
"GradientBoostingClassifier", "GradientBoostingRegressor"]
7676

7777

78+
def _set_test_name(function, name):
79+
function.description = "sklearn.tests.test_common.{0}({1})".format(function.__name__, name)
80+
return function
81+
82+
7883
def _yield_non_meta_checks(name, Estimator):
7984
yield check_estimators_dtypes
8085
yield check_fit_score_takes_y

0 commit comments

Comments
 (0)