From fa705d37265d25581eb9bfd5c1f41ea11c94743b Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 18 Jun 2023 16:50:32 -0400 Subject: [PATCH] Inline the symlink setup. --- tests/fixtures.py | 26 -------------------------- tests/test_main.py | 26 ++++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/tests/fixtures.py b/tests/fixtures.py index e0413cc8..c0b0fa32 100644 --- a/tests/fixtures.py +++ b/tests/fixtures.py @@ -169,32 +169,6 @@ def setUp(self): build_files(DistInfoPkg.files, self.site_dir) -class DistInfoSymlinkedPkg(OnSysPath, SiteDir): - files: FilesSpec = { - "symlinked_pkg-1.0.0.dist-info": { - "METADATA": """ - Name: symlinked-pkg - Version: 1.0.0 - """, - "RECORD": "symlinked,,\n", - }, - ".symlink.target": { - "__init__.py": """ - def main(): - print("hello world") - """, - }, - # "symlinked" -> ".symlink.target", see below - } - - def setUp(self): - super().setUp() - build_files(DistInfoSymlinkedPkg.files, self.site_dir) - target = self.site_dir / ".symlink.target" - assert target.is_dir() - (self.site_dir / "symlinked").symlink_to(target, target_is_directory=True) - - class EggInfoPkg(OnSysPath, SiteDir): files: FilesSpec = { "egginfo_pkg.egg-info": { diff --git a/tests/test_main.py b/tests/test_main.py index 5f653f3d..0bcb7ac9 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -401,14 +401,36 @@ def test_packages_distributions_all_module_types(self): class PackagesDistributionsDistTest( - fixtures.DistInfoSymlinkedPkg, - unittest.TestCase, + fixtures.OnSysPath, fixtures.SiteDir, unittest.TestCase ): def test_packages_distributions_symlinked_top_level(self): """ Distribution is resolvable from a simple top-level symlink in RECORD. See #452. """ + + files: fixtures.FilesSpec = { + "symlinked_pkg-1.0.0.dist-info": { + "METADATA": """ + Name: symlinked-pkg + Version: 1.0.0 + """, + "RECORD": "symlinked,,\n", + }, + ".symlink.target": { + "__init__.py": """ + def main(): + print("hello world") + """, + }, + # "symlinked" -> ".symlink.target", see below + } + + fixtures.build_files(files, self.site_dir) + target = self.site_dir / ".symlink.target" + assert target.is_dir() + (self.site_dir / "symlinked").symlink_to(target, target_is_directory=True) + assert packages_distributions()['symlinked'] == ['symlinked-pkg']