From f8285cac4b95e6b43869e27093ef04552e665681 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 1 Jan 2015 23:31:22 -0500 Subject: Move fixture to a fixtures module and make that fixture available globally. --- setuptools/tests/fixtures.py | 16 ++++++++++++++++ setuptools/tests/test_bdist_egg.py | 15 --------------- 2 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 setuptools/tests/fixtures.py (limited to 'setuptools/tests') diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py new file mode 100644 index 00000000..6b0e53f3 --- /dev/null +++ b/setuptools/tests/fixtures.py @@ -0,0 +1,16 @@ +import mock +import pytest + +from . import contexts + +@pytest.yield_fixture +def user_override(): + """ + Override site.USER_BASE and site.USER_SITE with temporary directories in + a context. + """ + with contexts.tempdir() as user_base: + with mock.patch('site.USER_BASE', user_base): + with contexts.tempdir() as user_site: + with mock.patch('site.USER_SITE', user_site): + yield diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py index 08bc75d7..ccfb2ea7 100644 --- a/setuptools/tests/test_bdist_egg.py +++ b/setuptools/tests/test_bdist_egg.py @@ -4,32 +4,17 @@ import os import re import pytest -import mock from setuptools.dist import Distribution from . import contexts - SETUP_PY = """\ from setuptools import setup setup(name='foo', py_modules=['hi']) """ -@pytest.yield_fixture -def user_override(): - """ - Override site.USER_BASE and site.USER_SITE with temporary directories in - a context. - """ - with contexts.tempdir() as user_base: - with mock.patch('site.USER_BASE', user_base): - with contexts.tempdir() as user_site: - with mock.patch('site.USER_SITE', user_site): - yield - - @pytest.yield_fixture def setup_context(tmpdir): with (tmpdir/'setup.py').open('w') as f: -- cgit v1.2.1