From 8547f18e6be2f38485b6edaf89e59726466c4a0c Mon Sep 17 00:00:00 2001 From: Simon Conseil Date: Mon, 13 Apr 2020 23:10:40 -0400 Subject: [PATCH] Use tmpdir instead of custom fixture --- tests/test_extended_caching.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/tests/test_extended_caching.py b/tests/test_extended_caching.py index 184e306..deedc06 100644 --- a/tests/test_extended_caching.py +++ b/tests/test_extended_caching.py @@ -1,22 +1,14 @@ import os import pickle -import pytest - from sigal.gallery import Gallery from sigal.plugins import extended_caching CURRENT_DIR = os.path.dirname(__file__) -@pytest.fixture() -def remove_cache(settings): - yield - cachepath = os.path.join(settings['destination'], ".exif_cache") - os.remove(cachepath) - - -def test_save_cache(settings, remove_cache): +def test_save_cache(settings, tmpdir): + settings['destination'] = str(tmpdir) gal = Gallery(settings, ncpu=1) extended_caching.save_cache(gal) @@ -32,7 +24,8 @@ def test_save_cache(settings, remove_cache): assert cache["exifTest/noexif.png"] == gal.albums["exifTest"].medias[2].exif -def test_restore_cache(settings, remove_cache): +def test_restore_cache(settings, tmpdir): + settings['destination'] = str(tmpdir) gal1 = Gallery(settings, ncpu=1) gal2 = Gallery(settings, ncpu=1) extended_caching.save_cache(gal1) @@ -40,7 +33,8 @@ def test_restore_cache(settings, remove_cache): assert gal1.exifCache == gal2.exifCache -def test_load_exif(settings, remove_cache): +def test_load_exif(settings, tmpdir): + settings['destination'] = str(tmpdir) gal1 = Gallery(settings, ncpu=1) gal1.albums["exifTest"].medias[2].exif = "blafoo" gal1.exifCache = {"exifTest/21.jpg": "Foo",