From 6626d2a3222c62efdd41eca8618f1203a28cfcc3 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Tue, 16 Apr 2019 15:32:21 +0200
Subject: [PATCH 01/11] tests: define a MEDIA_ROOT (#31595)

To prevent cluttering project root with tests files.
---
 tests/conftest.py      | 3 ++-
 tests/test_actesweb.py | 8 --------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 75fe8e81..9bdca02b 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -11,11 +11,12 @@ from .utils import make_resource
 
 
 @pytest.fixture
-def app(request):
+def app(request, settings, tmpdir):
     wtm = django_webtest.WebTestMixin()
     wtm._patch_settings()
     request.addfinalizer(wtm._unpatch_settings)
     cache.clear()
+    settings.MEDIA_ROOT = str(tmpdir.mkdir('media'))
     return django_webtest.DjangoTestApp()
 
 
diff --git a/tests/test_actesweb.py b/tests/test_actesweb.py
index 0d48d645..82ea55a3 100644
--- a/tests/test_actesweb.py
+++ b/tests/test_actesweb.py
@@ -45,14 +45,6 @@ def actesweb(db):
     return utils.make_resource(ActesWeb, **{'slug': 'test'})
 
 
-@pytest.fixture(autouse=True)
-def media_dir(tmpdir, settings):
-    tmp_dir = tmpdir.mkdir('actesweb').dirname
-    settings.MEDIA_ROOT = tmp_dir
-    yield tmp_dir
-    shutil.rmtree(tmp_dir, ignore_errors=True)
-
-
 PAYLOAD = [
     {
         'birth': json.loads(get_file_from_test_base_dir('payload_birth.json'))
-- 
2.20.1