From 33886a7ecce2ec6269eade7a31baf055bd673802 Mon Sep 17 00:00:00 2001 From: Alice Bevan-McGregor Date: Sun, 15 Nov 2009 05:41:43 -0800 Subject: Added upload_docs unit test and fixed a bug in test_develop. --HG-- branch : distribute extra : rebase_source : 0ce56dee9fbf2976d41f403fb86d8a2f714820c2 --- setuptools/tests/test_upload_docs.py | 65 ++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 setuptools/tests/test_upload_docs.py (limited to 'setuptools/tests/test_upload_docs.py') diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py new file mode 100644 index 00000000..15db899f --- /dev/null +++ b/setuptools/tests/test_upload_docs.py @@ -0,0 +1,65 @@ +"""build_ext tests +""" +import sys, os, shutil, tempfile, unittest, site, zipfile +from setuptools.command.upload_docs import upload_docs +from setuptools.dist import Distribution + +SETUP_PY = """\ +from setuptools import setup + +setup(name='foo') +""" + +class TestUploadDocsTest(unittest.TestCase): + def setUp(self): + self.dir = tempfile.mkdtemp() + setup = os.path.join(self.dir, 'setup.py') + f = open(setup, 'w') + f.write(SETUP_PY) + f.close() + self.old_cwd = os.getcwd() + os.chdir(self.dir) + + self.upload_dir = os.path.join(self.dir, 'build') + os.mkdir(self.upload_dir) + + # A test document. + f = open(os.path.join(self.upload_dir, 'index.html'), 'w') + f.write("Hello world.") + f.close() + + # An empty folder. + os.mkdir(os.path.join(self.upload_dir, 'empty')) + + if sys.version >= "2.6": + self.old_base = site.USER_BASE + site.USER_BASE = upload_docs.USER_BASE = tempfile.mkdtemp() + self.old_site = site.USER_SITE + site.USER_SITE = upload_docs.USER_SITE = tempfile.mkdtemp() + + def tearDown(self): + os.chdir(self.old_cwd) + shutil.rmtree(self.dir) + if sys.version >= "2.6": + shutil.rmtree(site.USER_BASE) + shutil.rmtree(site.USER_SITE) + site.USER_BASE = self.old_base + site.USER_SITE = self.old_site + + def test_create_zipfile(self): + # Test to make sure zipfile creation handles common cases. + # This explicitly includes a folder containing an empty folder. + + dist = Distribution() + + cmd = upload_docs(dist) + cmd.upload_dir = self.upload_dir + zip_file = cmd.create_zipfile() + + assert zipfile.is_zipfile(zip_file) + + zip_f = zipfile.ZipFile(zip_file) # woh... + + assert zip_f.namelist() == ['index.html'] + + -- cgit v1.2.1 From 6a6a261fa50522d77fba6d6345fb71ba9f00c311 Mon Sep 17 00:00:00 2001 From: Tarek Ziade Date: Thu, 6 May 2010 18:10:32 +0200 Subject: make sure all tests passes on all python versions fixes #149 --HG-- branch : distribute extra : rebase_source : 6288f4fcf65083b9d4ffb0ea8b35af44e699b4d5 --- setuptools/tests/test_upload_docs.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'setuptools/tests/test_upload_docs.py') diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py index 15db899f..8b2dc892 100644 --- a/setuptools/tests/test_upload_docs.py +++ b/setuptools/tests/test_upload_docs.py @@ -19,24 +19,24 @@ class TestUploadDocsTest(unittest.TestCase): f.close() self.old_cwd = os.getcwd() os.chdir(self.dir) - + self.upload_dir = os.path.join(self.dir, 'build') os.mkdir(self.upload_dir) - + # A test document. f = open(os.path.join(self.upload_dir, 'index.html'), 'w') f.write("Hello world.") f.close() - + # An empty folder. os.mkdir(os.path.join(self.upload_dir, 'empty')) - + if sys.version >= "2.6": self.old_base = site.USER_BASE site.USER_BASE = upload_docs.USER_BASE = tempfile.mkdtemp() self.old_site = site.USER_SITE site.USER_SITE = upload_docs.USER_SITE = tempfile.mkdtemp() - + def tearDown(self): os.chdir(self.old_cwd) shutil.rmtree(self.dir) @@ -49,17 +49,17 @@ class TestUploadDocsTest(unittest.TestCase): def test_create_zipfile(self): # Test to make sure zipfile creation handles common cases. # This explicitly includes a folder containing an empty folder. - + dist = Distribution() - + cmd = upload_docs(dist) cmd.upload_dir = self.upload_dir zip_file = cmd.create_zipfile() - + assert zipfile.is_zipfile(zip_file) - + zip_f = zipfile.ZipFile(zip_file) # woh... - + assert zip_f.namelist() == ['index.html'] - + -- cgit v1.2.1 From 47598ca259c8870efa3061144493758c187deb3d Mon Sep 17 00:00:00 2001 From: "Stefan H. Holek" Date: Fri, 19 Oct 2012 11:35:52 +0200 Subject: Fix a test broken by 984cedb. --HG-- branch : distribute extra : rebase_source : f9fe65a5b00a1a64f812aa99716cc913a4b39188 --- setuptools/tests/test_upload_docs.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'setuptools/tests/test_upload_docs.py') diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py index 8b2dc892..fddb755d 100644 --- a/setuptools/tests/test_upload_docs.py +++ b/setuptools/tests/test_upload_docs.py @@ -54,12 +54,17 @@ class TestUploadDocsTest(unittest.TestCase): cmd = upload_docs(dist) cmd.upload_dir = self.upload_dir - zip_file = cmd.create_zipfile() + cmd.target_dir = self.upload_dir + tmp_dir = tempfile.mkdtemp() + tmp_file = os.path.join(tmp_dir, 'foo.zip') + try: + zip_file = cmd.create_zipfile(tmp_file) - assert zipfile.is_zipfile(zip_file) + assert zipfile.is_zipfile(tmp_file) - zip_f = zipfile.ZipFile(zip_file) # woh... - - assert zip_f.namelist() == ['index.html'] + zip_file = zipfile.ZipFile(tmp_file) # woh... + assert zip_file.namelist() == ['index.html'] + finally: + shutil.rmtree(tmp_dir) -- cgit v1.2.1 From 152931a9f0fc509eab7d3c10934f6d3137651104 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 21 Oct 2012 03:38:07 -0400 Subject: Fix failing test case on Windows (can't rmtree if a file is open in that tree) --HG-- branch : distribute extra : rebase_source : 99e78b88c18007b410c0be28237db8341413e334 --- setuptools/tests/test_upload_docs.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'setuptools/tests/test_upload_docs.py') diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py index fddb755d..769f16cc 100644 --- a/setuptools/tests/test_upload_docs.py +++ b/setuptools/tests/test_upload_docs.py @@ -65,6 +65,8 @@ class TestUploadDocsTest(unittest.TestCase): zip_file = zipfile.ZipFile(tmp_file) # woh... assert zip_file.namelist() == ['index.html'] + + zip_file.close() finally: shutil.rmtree(tmp_dir) -- cgit v1.2.1 From 6f3dd242a7856fb7d6be2a59fccbab449367285b Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 2 Jan 2015 12:57:07 -0500 Subject: Normalize imports --- setuptools/tests/test_upload_docs.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'setuptools/tests/test_upload_docs.py') diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py index 769f16cc..a1bd835f 100644 --- a/setuptools/tests/test_upload_docs.py +++ b/setuptools/tests/test_upload_docs.py @@ -1,6 +1,13 @@ """build_ext tests """ -import sys, os, shutil, tempfile, unittest, site, zipfile +import sys +import os +import shutil +import tempfile +import unittest +import site +import zipfile + from setuptools.command.upload_docs import upload_docs from setuptools.dist import Distribution -- cgit v1.2.1 From e97379a558d1134ae402a428cda975911ba7d9e7 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 2 Jan 2015 12:58:14 -0500 Subject: Use DALS --- setuptools/tests/test_upload_docs.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'setuptools/tests/test_upload_docs.py') diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py index a1bd835f..f4e43d7c 100644 --- a/setuptools/tests/test_upload_docs.py +++ b/setuptools/tests/test_upload_docs.py @@ -11,11 +11,16 @@ import zipfile from setuptools.command.upload_docs import upload_docs from setuptools.dist import Distribution -SETUP_PY = """\ -from setuptools import setup +from .textwrap import DALS + + +SETUP_PY = DALS( + """ + from setuptools import setup + + setup(name='foo') + """) -setup(name='foo') -""" class TestUploadDocsTest(unittest.TestCase): def setUp(self): -- cgit v1.2.1 From 3c40f86c2e1fac7707b6a7f2a25920fbb74ee270 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 2 Jan 2015 13:00:18 -0500 Subject: Remove dependence on unittest in test_upload_docs --- setuptools/tests/test_upload_docs.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'setuptools/tests/test_upload_docs.py') diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py index f4e43d7c..2d478866 100644 --- a/setuptools/tests/test_upload_docs.py +++ b/setuptools/tests/test_upload_docs.py @@ -4,7 +4,6 @@ import sys import os import shutil import tempfile -import unittest import site import zipfile @@ -22,8 +21,8 @@ SETUP_PY = DALS( """) -class TestUploadDocsTest(unittest.TestCase): - def setUp(self): +class TestUploadDocsTest: + def setup_method(self, method): self.dir = tempfile.mkdtemp() setup = os.path.join(self.dir, 'setup.py') f = open(setup, 'w') @@ -49,7 +48,7 @@ class TestUploadDocsTest(unittest.TestCase): self.old_site = site.USER_SITE site.USER_SITE = upload_docs.USER_SITE = tempfile.mkdtemp() - def tearDown(self): + def teardown_method(self, method): os.chdir(self.old_cwd) shutil.rmtree(self.dir) if sys.version >= "2.6": -- cgit v1.2.1 From ddbaa77c8f1ad3cbb42957f03707804b13863d18 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 2 Jan 2015 13:01:03 -0500 Subject: Remove copy pasta --- setuptools/tests/test_upload_docs.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'setuptools/tests/test_upload_docs.py') diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py index 2d478866..f7052e6e 100644 --- a/setuptools/tests/test_upload_docs.py +++ b/setuptools/tests/test_upload_docs.py @@ -1,5 +1,3 @@ -"""build_ext tests -""" import sys import os import shutil -- cgit v1.2.1 From 144cd7bb846c5bcbadf1676d5455a065de52419a Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 2 Jan 2015 13:06:33 -0500 Subject: Leverage fixtures for sample project and user_overrides. --- setuptools/tests/test_upload_docs.py | 53 ++++++++++++------------------------ 1 file changed, 18 insertions(+), 35 deletions(-) (limited to 'setuptools/tests/test_upload_docs.py') diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py index f7052e6e..9e85f0d6 100644 --- a/setuptools/tests/test_upload_docs.py +++ b/setuptools/tests/test_upload_docs.py @@ -1,10 +1,10 @@ -import sys import os import shutil import tempfile -import site import zipfile +import pytest + from setuptools.command.upload_docs import upload_docs from setuptools.dist import Distribution @@ -19,41 +19,25 @@ SETUP_PY = DALS( """) -class TestUploadDocsTest: - def setup_method(self, method): - self.dir = tempfile.mkdtemp() - setup = os.path.join(self.dir, 'setup.py') - f = open(setup, 'w') +@pytest.fixture +def sample_project(tmpdir_cwd): + # setup.py + with open('setup.py', 'wt') as f: f.write(SETUP_PY) - f.close() - self.old_cwd = os.getcwd() - os.chdir(self.dir) - self.upload_dir = os.path.join(self.dir, 'build') - os.mkdir(self.upload_dir) + os.mkdir('build') - # A test document. - f = open(os.path.join(self.upload_dir, 'index.html'), 'w') + # A test document. + with open('build/index.html', 'w') as f: f.write("Hello world.") - f.close() - - # An empty folder. - os.mkdir(os.path.join(self.upload_dir, 'empty')) - - if sys.version >= "2.6": - self.old_base = site.USER_BASE - site.USER_BASE = upload_docs.USER_BASE = tempfile.mkdtemp() - self.old_site = site.USER_SITE - site.USER_SITE = upload_docs.USER_SITE = tempfile.mkdtemp() - - def teardown_method(self, method): - os.chdir(self.old_cwd) - shutil.rmtree(self.dir) - if sys.version >= "2.6": - shutil.rmtree(site.USER_BASE) - shutil.rmtree(site.USER_SITE) - site.USER_BASE = self.old_base - site.USER_SITE = self.old_site + + # An empty folder. + os.mkdir('build/empty') + + +@pytest.mark.usefixtures('sample_project') +@pytest.mark.usefixtures('user_override') +class TestUploadDocsTest: def test_create_zipfile(self): # Test to make sure zipfile creation handles common cases. @@ -62,8 +46,7 @@ class TestUploadDocsTest: dist = Distribution() cmd = upload_docs(dist) - cmd.upload_dir = self.upload_dir - cmd.target_dir = self.upload_dir + cmd.target_dir = cmd.upload_dir = 'build' tmp_dir = tempfile.mkdtemp() tmp_file = os.path.join(tmp_dir, 'foo.zip') try: -- cgit v1.2.1 From b72261b9a0c9e45c730eff86fae594428f6f932a Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 2 Jan 2015 13:07:41 -0500 Subject: Replace comment with clearer docstring. --- setuptools/tests/test_upload_docs.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'setuptools/tests/test_upload_docs.py') diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py index 9e85f0d6..6fe9e051 100644 --- a/setuptools/tests/test_upload_docs.py +++ b/setuptools/tests/test_upload_docs.py @@ -40,8 +40,10 @@ def sample_project(tmpdir_cwd): class TestUploadDocsTest: def test_create_zipfile(self): - # Test to make sure zipfile creation handles common cases. - # This explicitly includes a folder containing an empty folder. + """ + Ensure zipfile creation handles common cases, including a folder + containing an empty folder. + """ dist = Distribution() -- cgit v1.2.1 From a87442aab8bd8779b562043540c467ffffb4d581 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 2 Jan 2015 13:09:46 -0500 Subject: Use tempdir context --- setuptools/tests/test_upload_docs.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'setuptools/tests/test_upload_docs.py') diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py index 6fe9e051..66d06dc0 100644 --- a/setuptools/tests/test_upload_docs.py +++ b/setuptools/tests/test_upload_docs.py @@ -1,6 +1,4 @@ import os -import shutil -import tempfile import zipfile import pytest @@ -9,6 +7,7 @@ from setuptools.command.upload_docs import upload_docs from setuptools.dist import Distribution from .textwrap import DALS +from . import contexts SETUP_PY = DALS( @@ -49,9 +48,8 @@ class TestUploadDocsTest: cmd = upload_docs(dist) cmd.target_dir = cmd.upload_dir = 'build' - tmp_dir = tempfile.mkdtemp() - tmp_file = os.path.join(tmp_dir, 'foo.zip') - try: + with contexts.tempdir() as tmp_dir: + tmp_file = os.path.join(tmp_dir, 'foo.zip') zip_file = cmd.create_zipfile(tmp_file) assert zipfile.is_zipfile(tmp_file) @@ -61,6 +59,3 @@ class TestUploadDocsTest: assert zip_file.namelist() == ['index.html'] zip_file.close() - finally: - shutil.rmtree(tmp_dir) - -- cgit v1.2.1 From 8aee42417b6635979dc0da1beba3eae4fc6c3c7c Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 2 Jan 2015 13:13:23 -0500 Subject: woh what? --- setuptools/tests/test_upload_docs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setuptools/tests/test_upload_docs.py') diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py index 66d06dc0..ea5c3587 100644 --- a/setuptools/tests/test_upload_docs.py +++ b/setuptools/tests/test_upload_docs.py @@ -54,7 +54,7 @@ class TestUploadDocsTest: assert zipfile.is_zipfile(tmp_file) - zip_file = zipfile.ZipFile(tmp_file) # woh... + zip_file = zipfile.ZipFile(tmp_file) assert zip_file.namelist() == ['index.html'] -- cgit v1.2.1 From afedfedb4669e8f4ab1677bdb71bb9895fb2dc13 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 2 Jan 2015 13:14:31 -0500 Subject: Open zip file in context --- setuptools/tests/test_upload_docs.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'setuptools/tests/test_upload_docs.py') diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py index ea5c3587..85f6d864 100644 --- a/setuptools/tests/test_upload_docs.py +++ b/setuptools/tests/test_upload_docs.py @@ -54,8 +54,5 @@ class TestUploadDocsTest: assert zipfile.is_zipfile(tmp_file) - zip_file = zipfile.ZipFile(tmp_file) - - assert zip_file.namelist() == ['index.html'] - - zip_file.close() + with zipfile.ZipFile(tmp_file) as zip_file: + assert zip_file.namelist() == ['index.html'] -- cgit v1.2.1 From db80c8f857b0c4ff3a5ad02a59e6442629599914 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 2 Jan 2015 13:19:13 -0500 Subject: Use closing for Python 2.6 compatibility --- setuptools/tests/test_upload_docs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setuptools/tests/test_upload_docs.py') diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py index 85f6d864..cc71cadb 100644 --- a/setuptools/tests/test_upload_docs.py +++ b/setuptools/tests/test_upload_docs.py @@ -1,5 +1,6 @@ import os import zipfile +import contextlib import pytest @@ -54,5 +55,5 @@ class TestUploadDocsTest: assert zipfile.is_zipfile(tmp_file) - with zipfile.ZipFile(tmp_file) as zip_file: + with contextlib.closing(zipfile.ZipFile(tmp_file)) as zip_file: assert zip_file.namelist() == ['index.html'] -- cgit v1.2.1 From f0a0f6f4ac7bbe405d29c9312956ce973b3e4be0 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 31 May 2016 22:35:19 -0400 Subject: Add test for build_multipart --- setuptools/tests/test_upload_docs.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'setuptools/tests/test_upload_docs.py') diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py index cc71cadb..d3dee616 100644 --- a/setuptools/tests/test_upload_docs.py +++ b/setuptools/tests/test_upload_docs.py @@ -57,3 +57,15 @@ class TestUploadDocsTest: with contextlib.closing(zipfile.ZipFile(tmp_file)) as zip_file: assert zip_file.namelist() == ['index.html'] + + def test_build_multipart(self): + data = dict( + a="foo", + b="bar", + file=('file.txt', b'content'), + ) + body, content_type = upload_docs._build_multipart(data) + assert 'form-data' in content_type + assert isinstance(body, bytes) + assert b'foo' in body + assert b'content' in body -- cgit v1.2.1 From 31bd37c6ac8de9e8c1bacebc2d8e1215df91eb96 Mon Sep 17 00:00:00 2001 From: stepshal Date: Tue, 18 Oct 2016 20:24:35 +0700 Subject: Fix quantity of blank lines. --- setuptools/tests/test_upload_docs.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'setuptools/tests/test_upload_docs.py') diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py index d3dee616..5d50bb0b 100644 --- a/setuptools/tests/test_upload_docs.py +++ b/setuptools/tests/test_upload_docs.py @@ -10,7 +10,6 @@ from setuptools.dist import Distribution from .textwrap import DALS from . import contexts - SETUP_PY = DALS( """ from setuptools import setup @@ -38,7 +37,6 @@ def sample_project(tmpdir_cwd): @pytest.mark.usefixtures('sample_project') @pytest.mark.usefixtures('user_override') class TestUploadDocsTest: - def test_create_zipfile(self): """ Ensure zipfile creation handles common cases, including a folder -- cgit v1.2.1 From 62fc6681509f04ba7ee12e87d6ac5d6056214fa8 Mon Sep 17 00:00:00 2001 From: Florian Schulze Date: Sat, 11 Mar 2017 14:45:15 +0100 Subject: Fix documentation upload by fixing content_type in _build_multipart on Python 3.x. --- setuptools/tests/test_upload_docs.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'setuptools/tests/test_upload_docs.py') diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py index 5d50bb0b..a26e32a6 100644 --- a/setuptools/tests/test_upload_docs.py +++ b/setuptools/tests/test_upload_docs.py @@ -64,6 +64,8 @@ class TestUploadDocsTest: ) body, content_type = upload_docs._build_multipart(data) assert 'form-data' in content_type + assert "b'" not in content_type + assert 'b"' not in content_type assert isinstance(body, bytes) assert b'foo' in body assert b'content' in body -- cgit v1.2.1 From 9be50723119ba4a636364b4dc17912f94d4632ec Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 20 Feb 2021 12:53:32 -0500 Subject: Use path builder in upload_docs tests. --- setuptools/tests/test_upload_docs.py | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) (limited to 'setuptools/tests/test_upload_docs.py') diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py index a26e32a6..55978aad 100644 --- a/setuptools/tests/test_upload_docs.py +++ b/setuptools/tests/test_upload_docs.py @@ -3,6 +3,7 @@ import zipfile import contextlib import pytest +from jaraco import path from setuptools.command.upload_docs import upload_docs from setuptools.dist import Distribution @@ -10,28 +11,20 @@ from setuptools.dist import Distribution from .textwrap import DALS from . import contexts -SETUP_PY = DALS( - """ - from setuptools import setup - - setup(name='foo') - """) - @pytest.fixture def sample_project(tmpdir_cwd): - # setup.py - with open('setup.py', 'wt') as f: - f.write(SETUP_PY) - - os.mkdir('build') - - # A test document. - with open('build/index.html', 'w') as f: - f.write("Hello world.") - - # An empty folder. - os.mkdir('build/empty') + path.build({ + 'setup.py': DALS(""" + from setuptools import setup + + setup(name='foo') + """), + 'build': { + 'index.html': 'Hello world.', + 'empty': {}, + } + }) @pytest.mark.usefixtures('sample_project') -- cgit v1.2.1