summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2019-12-31 13:31:37 -0500
committerJason R. Coombs <jaraco@jaraco.com>2019-12-31 13:31:37 -0500
commit9e3149802ee214ee0500ec299250bf4febc67e52 (patch)
tree83d31ffdcfae2ae703c6af98ef2f343b11c4bd2b
parent9c40ab8861d1bbc18d1c8032f678e2ca15ada7ff (diff)
downloadpython-setuptools-git-9e3149802ee214ee0500ec299250bf4febc67e52.tar.gz
Remove instance attribute; rely on tmpdir fixture; re-use touch helper.
-rw-r--r--setuptools/tests/test_sdist.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index f2e9a5ec..1b951a5b 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -98,7 +98,6 @@ def touch(path):
class TestSdistTest:
@pytest.fixture(autouse=True)
def source_dir(self, tmpdir):
- self.temp_dir = str(tmpdir)
(tmpdir / 'setup.py').write_text(SETUP_PY, encoding='utf-8')
# Set up the rest of the test package
@@ -176,14 +175,14 @@ class TestSdistTest:
manifest = cmd.filelist.files
assert 'setup.py' not in manifest
- def test_defaults_case_sensitivity(self):
+ def test_defaults_case_sensitivity(self, tmpdir):
"""
Make sure default files (README.*, etc.) are added in a case-sensitive
way to avoid problems with packages built on Windows.
"""
- open(os.path.join(self.temp_dir, 'readme.rst'), 'w').close()
- open(os.path.join(self.temp_dir, 'SETUP.cfg'), 'w').close()
+ touch(tmpdir / 'readme.rst')
+ touch(tmpdir / 'SETUP.cfg')
dist = Distribution(SETUP_ATTRS)
# the extension deliberately capitalized for this test
@@ -450,11 +449,11 @@ class TestSdistTest:
except UnicodeDecodeError:
filename not in cmd.filelist.files
- def test_pyproject_toml_in_sdist(self):
+ def test_pyproject_toml_in_sdist(self, tmpdir):
"""
Check if pyproject.toml is included in source distribution if present
"""
- open(os.path.join(self.temp_dir, 'pyproject.toml'), 'w').close()
+ touch(tmpdir / 'pyproject.toml')
dist = Distribution(SETUP_ATTRS)
dist.script_name = 'setup.py'
cmd = sdist(dist)
@@ -464,11 +463,11 @@ class TestSdistTest:
manifest = cmd.filelist.files
assert 'pyproject.toml' in manifest
- def test_pyproject_toml_excluded(self):
+ def test_pyproject_toml_excluded(self, tmpdir):
"""
Check that pyproject.toml can excluded even if present
"""
- open(os.path.join(self.temp_dir, 'pyproject.toml'), 'w').close()
+ touch(tmpdir / 'pyproject.toml')
with open('MANIFEST.in', 'w') as mts:
print('exclude pyproject.toml', file=mts)
dist = Distribution(SETUP_ATTRS)