From 99a8db9d545656735732e2b43ada6af040d1710f Mon Sep 17 00:00:00 2001 From: cgohlke Date: Sat, 25 Feb 2012 19:30:58 -0800 Subject: [PATCH] Restore previous io plugins --- skimage/io/tests/test_tifffile.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/skimage/io/tests/test_tifffile.py b/skimage/io/tests/test_tifffile.py index e412cd93..cd68b2d8 100644 --- a/skimage/io/tests/test_tifffile.py +++ b/skimage/io/tests/test_tifffile.py @@ -9,11 +9,19 @@ from tempfile import NamedTemporaryFile try: import skimage.io._plugins.tifffile_plugin as tf + _plugins = sio.plugin_order() TF_available = True sio.use_plugin('tifffile') except OSError: TF_available = False + +def teardown(): + if TF_available: + for k, v in _plugins.items(): + sio.use_plugin(v[0], k) + + @skipif(not TF_available) def test_imread_uint16(): expected = np.load(os.path.join(si.data_dir, 'chessboard_GRAY_U8.npy')) @@ -21,6 +29,7 @@ def test_imread_uint16(): assert img.dtype == np.uint16 assert_array_almost_equal(img, expected) + @skipif(not TF_available) def test_imread_uint16_big_endian(): expected = np.load(os.path.join(si.data_dir, 'chessboard_GRAY_U8.npy'))