From f4970f9707738dfd5e5098bb41d868f9b6fc2fe8 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 3 Feb 2015 21:47:56 -0600 Subject: [PATCH] Fix canny import test --- skimage/filters/tests/test_deprecated_imports.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/skimage/filters/tests/test_deprecated_imports.py b/skimage/filters/tests/test_deprecated_imports.py index c969be5a..2ea21ca2 100644 --- a/skimage/filters/tests/test_deprecated_imports.py +++ b/skimage/filters/tests/test_deprecated_imports.py @@ -1,4 +1,6 @@ from warnings import catch_warnings, simplefilter +from ..._shared._warnings import expected_warnings +from ...data import moon def test_filter_import(): @@ -11,9 +13,7 @@ def test_filter_import(): def test_canny_import(): - with catch_warnings(): - simplefilter('ignore') + data = moon() + with expected_warnings(['skimage.feature.canny']): from skimage.filters import canny - - assert('canny' in dir(F)) - assert F._import_warned + canny(data)