From ff5882d92b8a18a61bbcb69de6207bc1fc83b815 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Wed, 3 Oct 2018 00:09:23 +0200 Subject: [PATCH 1/2] tests: simplify fixture using standard ones (#26911) --- tests_authentic/conftest.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/tests_authentic/conftest.py b/tests_authentic/conftest.py index 89e94d5..fe31609 100644 --- a/tests_authentic/conftest.py +++ b/tests_authentic/conftest.py @@ -1,23 +1,17 @@ import os -import tempfile -import shutil import json import pytest @pytest.fixture -def tenant_base(request, settings): - base = tempfile.mkdtemp('authentic-tenant-base') +def tenant_base(request, settings, tmpdir): + base = str(tmpdir.mkdir('authentic-tenant-base')) settings.TENANT_BASE = base - - def fin(): - shutil.rmtree(base) - request.addfinalizer(fin) return base -@pytest.fixture(scope='function') +@pytest.fixture def tenant(transactional_db, request, settings, tenant_base): from hobo.multitenant.models import Tenant base = tenant_base -- 2.18.0