diff options
| -rw-r--r-- | setuptools/tests/test_find_packages.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/setuptools/tests/test_find_packages.py b/setuptools/tests/test_find_packages.py index bc7d03bf..3e2619fc 100644 --- a/setuptools/tests/test_find_packages.py +++ b/setuptools/tests/test_find_packages.py @@ -87,35 +87,38 @@ class TestFindPackages(unittest.TestCase): packages = find_packages(self.dist_dir) self.assertTrue('pkg.some.data' not in packages) + def _assert_packages(self, actual, expected): + self.assertEqual(set(actual), set(expected)) + @skipIf(not PEP420, 'PEP 420 only') def test_pep420_ns_package(self): packages = find_packages( self.dist_dir, include=['pkg*'], exclude=['pkg.subpkg.assets']) - self.assertEqual(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg']) + self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg']) @skipIf(not PEP420, 'PEP 420 only') def test_pep420_ns_package_no_includes(self): packages = find_packages( self.dist_dir, exclude=['pkg.subpkg.assets']) - self.assertEqual(packages, ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg']) + self._assert_packages(packages, ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg']) @skipIf(not PEP420, 'PEP 420 only') def test_pep420_ns_package_no_includes_or_excludes(self): packages = find_packages(self.dist_dir) expected = [ 'docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg', 'pkg.subpkg.assets'] - self.assertEqual(packages, expected) + self._assert_packages(packages, expected) @skipIf(not PEP420, 'PEP 420 only') def test_regular_package_with_nested_pep420_ns_packages(self): self._touch('__init__.py', self.pkg_dir) packages = find_packages( self.dist_dir, exclude=['docs', 'pkg.subpkg.assets']) - self.assertEqual(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg']) + self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg']) @skipIf(not PEP420, 'PEP 420 only') def test_pep420_ns_package_no_non_package_dirs(self): shutil.rmtree(self.docs_dir) shutil.rmtree(os.path.join(self.dist_dir, 'pkg/subpkg/assets')) packages = find_packages(self.dist_dir) - self.assertEqual(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg']) + self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg']) |