@@ -26,15 +26,6 @@ def __init__(self, estimator, param_grid, scoring=None, fit_params=None,
2626 scoring , fit_params , n_jobs , iid , refit , cv ,
2727 verbose , pre_dispatch , error_score )
2828
29- # These methods do not raise ValueError but something different
30- _blacklist = set (['test_pickle' ,
31- 'test_grid_search_precomputed_kernel_error_nonsquare' ,
32- 'test_grid_search_precomputed_kernel_error_kernel_function' ,
33- 'test_grid_search_precomputed_kernel' ,
34- 'test_grid_search_failing_classifier_raise' ,
35- 'test_grid_search_score_method' , # added this because the sklearn implementation of fit() fails it'
36- 'test_grid_search_failing_classifier' ]) # This one we should investigate
37-
3829def _create_method (method ):
3930 def do_test_expected (* kwargs ):
4031 method ()
@@ -44,11 +35,9 @@ def _add_to_module():
4435 SKGridSearchCV = sklearn .grid_search .GridSearchCV
4536 sklearn .grid_search .GridSearchCV = SPGridSearchWrapper
4637 sklearn .grid_search .GridSearchCV_original = SKGridSearchCV
47- from sklearn .tests import test_grid_search
4838 from sklearn .model_selection .tests import test_search
49- allTests = test_grid_search .__dict__ .items () + test_search .__dict__ .items ()
50- all_methods = [(mname , method ) for (mname , method ) in allTests
51- if mname .startswith ("test_" ) and mname not in _blacklist ]
39+ all_methods = [(mname , method ) for (mname , method ) in test_search .__dict__ .items ()
40+ if mname .startswith ("test_" )]
5241
5342 for name , method in all_methods :
5443 method_for_test = _create_method (method )
0 commit comments