aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/tests/test_find_packages.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2015-01-01 16:48:11 -0500
committerJason R. Coombs <jaraco@jaraco.com>2015-01-01 16:48:11 -0500
commit4f9b50728ae8c5cf81b13b2d4fd3098b9f18dfb1 (patch)
tree6ea10c9e02a27ae63172513ed1a5b8e6ccfa866f /setuptools/tests/test_find_packages.py
parentc04985bc9b29c2e181697b10059e99fc77ef532d (diff)
downloadexternal_python_setuptools-4f9b50728ae8c5cf81b13b2d4fd3098b9f18dfb1.tar.gz
external_python_setuptools-4f9b50728ae8c5cf81b13b2d4fd3098b9f18dfb1.tar.bz2
external_python_setuptools-4f9b50728ae8c5cf81b13b2d4fd3098b9f18dfb1.zip
Use pytest for skips
Diffstat (limited to 'setuptools/tests/test_find_packages.py')
-rw-r--r--setuptools/tests/test_find_packages.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py
index fe390728..50513a69 100644
--- a/setuptools/tests/test_find_packages.py
+++ b/setuptools/tests/test_find_packages.py
@@ -6,9 +6,10 @@ import tempfile
import unittest
import platform
+import pytest
+
import setuptools
from setuptools import find_packages
-from setuptools.tests.py26compat import skipIf
find_420_packages = setuptools.PEP420PackageFinder.find
@@ -123,7 +124,7 @@ class TestFindPackages(unittest.TestCase):
packages = find_packages(self.dist_dir)
self.assertTrue('build.pkg' not in packages)
- @skipIf(not has_symlink(), 'Symlink support required')
+ @pytest.mark.skipif(not has_symlink(), reason='Symlink support required')
def test_symlinked_packages_are_included(self):
"""
A symbolically-linked directory should be treated like any other