Revert "Comment out non-python2.5 test"

Fabian Pedregosa · Fabian Pedregosa · commit 455e214db3a0 · 2011-09-21T15:56:03.000+02:00
This reverts commit 59a7b18.
diff --git a/sklearn/linear_model/tests/test_omp.py b/sklearn/linear_model/tests/test_omp.py
@@ -60,15 +60,17 @@ def test_with_without_gram_tol():
 
 
 def test_unreachable_accuracy():
-    warnings.simplefilter('always')
-    assert_array_almost_equal(
-        orthogonal_mp(X, y, tol=0),
-        orthogonal_mp(X, y, n_nonzero_coefs=n_features))
+    with warnings.catch_warnings(record=True) as w:
+        warnings.simplefilter('always')
+        assert_array_almost_equal(
+            orthogonal_mp(X, y, tol=0),
+            orthogonal_mp(X, y, n_nonzero_coefs=n_features))
 
-    assert_array_almost_equal(
-        orthogonal_mp(X, y, tol=0, precompute_gram=True),
-        orthogonal_mp(X, y, precompute_gram=True,
-                      n_nonzero_coefs=n_features))
+        assert_array_almost_equal(
+            orthogonal_mp(X, y, tol=0, precompute_gram=True),
+            orthogonal_mp(X, y, precompute_gram=True,
+                          n_nonzero_coefs=n_features))
+        assert len(w) > 0  # warnings should be raised
 
 
 def test_bad_input():
@@ -122,5 +124,7 @@ def test_identical_regressors():
     gamma = np.zeros(n_features)
     gamma[0] = gamma[1] = 1.
     newy = np.dot(newX, gamma)
-    warnings.simplefilter('always')
-    orthogonal_mp(newX, newy, 2)
+    with warnings.catch_warnings(record=True) as w:
+        warnings.simplefilter('always')
+        orthogonal_mp(newX, newy, 2)
+        assert len(w) == 1
