mirror of
https://github.com/python/cpython.git
synced 2025-07-23 03:05:38 +00:00
GH-128520: pathlib ABCs: allow tests to be run externally (#131315)
Adjust the tests for the `pathlib.types` module so that they can be run against the `pathlib-abc` PyPI package, which is a backport of the module for older Python versions. Specifically, we add a `.support.is_pypi` switch that is false in the stdlib and true in the pathlib-abc package. This controls which package we import, and whether or not we run tests against `PurePath` and `Path`. For compatibility with older Python versions, we stop using `zipfile.ZipFile.mkdir()` and `zipfile.ZipInfo._for_archive()`.
This commit is contained in:
parent
56d0f9af14
commit
cf9d1a4b6b
10 changed files with 127 additions and 72 deletions
|
@ -5,10 +5,9 @@ Tests for copying from pathlib.types._ReadablePath to _WritablePath.
|
|||
import contextlib
|
||||
import unittest
|
||||
|
||||
from pathlib import Path
|
||||
|
||||
from test.test_pathlib.support.local_path import LocalPathGround, WritableLocalPath
|
||||
from test.test_pathlib.support.zip_path import ZipPathGround, ReadableZipPath, WritableZipPath
|
||||
from .support import is_pypi
|
||||
from .support.local_path import LocalPathGround
|
||||
from .support.zip_path import ZipPathGround, ReadableZipPath, WritableZipPath
|
||||
|
||||
|
||||
class CopyTestBase:
|
||||
|
@ -53,7 +52,7 @@ class CopyTestBase:
|
|||
self.target_ground.readbytes(result))
|
||||
|
||||
def test_copy_file_to_directory(self):
|
||||
if not isinstance(self.target_root, WritableLocalPath):
|
||||
if isinstance(self.target_root, WritableZipPath):
|
||||
self.skipTest('needs local target')
|
||||
source = self.source_root / 'fileA'
|
||||
target = self.target_root / 'copyA'
|
||||
|
@ -113,7 +112,7 @@ class CopyTestBase:
|
|||
self.assertEqual(self.target_ground.readlink(target / 'linkD'), 'dirD')
|
||||
|
||||
def test_copy_dir_to_existing_directory(self):
|
||||
if not isinstance(self.target_root, WritableLocalPath):
|
||||
if isinstance(self.target_root, WritableZipPath):
|
||||
self.skipTest('needs local target')
|
||||
source = self.source_root / 'dirC'
|
||||
target = self.target_root / 'copyC'
|
||||
|
@ -153,19 +152,22 @@ class ZipToZipPathCopyTest(CopyTestBase, unittest.TestCase):
|
|||
target_ground = ZipPathGround(WritableZipPath)
|
||||
|
||||
|
||||
class ZipToLocalPathCopyTest(CopyTestBase, unittest.TestCase):
|
||||
source_ground = ZipPathGround(ReadableZipPath)
|
||||
target_ground = LocalPathGround(Path)
|
||||
if not is_pypi:
|
||||
from pathlib import Path
|
||||
|
||||
class ZipToLocalPathCopyTest(CopyTestBase, unittest.TestCase):
|
||||
source_ground = ZipPathGround(ReadableZipPath)
|
||||
target_ground = LocalPathGround(Path)
|
||||
|
||||
|
||||
class LocalToZipPathCopyTest(CopyTestBase, unittest.TestCase):
|
||||
source_ground = LocalPathGround(Path)
|
||||
target_ground = ZipPathGround(WritableZipPath)
|
||||
class LocalToZipPathCopyTest(CopyTestBase, unittest.TestCase):
|
||||
source_ground = LocalPathGround(Path)
|
||||
target_ground = ZipPathGround(WritableZipPath)
|
||||
|
||||
|
||||
class LocalToLocalPathCopyTest(CopyTestBase, unittest.TestCase):
|
||||
source_ground = LocalPathGround(Path)
|
||||
target_ground = LocalPathGround(Path)
|
||||
class LocalToLocalPathCopyTest(CopyTestBase, unittest.TestCase):
|
||||
source_ground = LocalPathGround(Path)
|
||||
target_ground = LocalPathGround(Path)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue