summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pkg_resources/api_tests.txt (renamed from tests/api_tests.txt)2
-rwxr-xr-xsetup.cfg2
-rw-r--r--setuptools/tests/__init__.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/api_tests.txt b/pkg_resources/api_tests.txt
index 65dba76d..50e04b87 100644
--- a/tests/api_tests.txt
+++ b/pkg_resources/api_tests.txt
@@ -171,7 +171,7 @@ You can append a path entry to a working set using ``add_entry()``::
['http://example.com/something']
>>> ws.add_entry(pkg_resources.__file__)
>>> ws.entries
- ['http://example.com/something', '...pkg_resources.py...']
+ ['http://example.com/something', '...pkg_resources...']
Multiple additions result in multiple entries, even if the entry is already in
the working set (because ``sys.path`` can contain the same entry more than
diff --git a/setup.cfg b/setup.cfg
index 24dd949d..5937edd0 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,5 +21,5 @@ formats = gztar zip
universal=1
[pytest]
-addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=tests/api_tests.txt
+addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt
norecursedirs=dist build *.egg
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index d6a4542e..48b29c4c 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -20,7 +20,7 @@ from setuptools.depends import Require
def additional_tests():
suite = unittest.TestSuite((
doctest.DocFileSuite(
- os.path.join('tests', 'api_tests.txt'),
+ 'api_tests.txt',
optionflags=doctest.ELLIPSIS, package='pkg_resources',
),
))