From 87f874fca97b507d89538f35f4653032a553e063 Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Thu, 20 Jun 2024 11:08:45 +0800 Subject: [PATCH] Skip until 3.13.0b3 instead --- tests/unit/test_collector.py | 24 ++++++++---------------- tests/unit/test_urls.py | 7 +++---- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/tests/unit/test_collector.py b/tests/unit/test_collector.py index 3efa4a050bf..e34104707ba 100644 --- a/tests/unit/test_collector.py +++ b/tests/unit/test_collector.py @@ -383,14 +383,10 @@ def test_clean_url_path_with_local_path(path: str, expected: str) -> None: pytest.param( "file:///T:/path/with spaces/", "file:///T:/path/with%20spaces", - marks=[ - pytest.mark.skipif("sys.platform != 'win32'"), - pytest.mark.xfail( - reason="Failing in Python 3.13.0a1, fixed in python/cpython#113563", - condition="sys.version_info >= (3, 13)", - strict=True, - ), - ], + marks=pytest.mark.skipif( + "sys.platform != 'win32' or " + "sys.version_info == (3, 13, 0, 'beta', 2)" + ), ), # URL with Windows drive letter, running on non-windows # platform. The `:` after the drive should be quoted. @@ -403,14 +399,10 @@ def test_clean_url_path_with_local_path(path: str, expected: str) -> None: pytest.param( "git+file:///T:/with space/repo.git@1.0#egg=my-package-1.0", "git+file:///T:/with%20space/repo.git@1.0#egg=my-package-1.0", - marks=[ - pytest.mark.skipif("sys.platform != 'win32'"), - pytest.mark.xfail( - reason="Failing in Python 3.13.0a1, fixed in python/cpython#113563", - condition="sys.version_info >= (3, 13)", - strict=True, - ), - ], + marks=pytest.mark.skipif( + "sys.platform != 'win32' or " + "sys.version_info == (3, 13, 0, 'beta', 2)" + ), ), # Test a VCS URL with a Windows drive letter and revision, # running on non-windows platform. diff --git a/tests/unit/test_urls.py b/tests/unit/test_urls.py index 45764638ed2..ba6bc6092a5 100644 --- a/tests/unit/test_urls.py +++ b/tests/unit/test_urls.py @@ -23,10 +23,9 @@ def test_path_to_url_unix() -> None: pytest.param( r"\\unc\as\path", "file://unc/as/path", - marks=pytest.mark.xfail( - reason="Failing in Python 3.13.0a1, fixed in python/cpython#113563", - condition="sys.version_info >= (3, 13)", - strict=True, + marks=pytest.mark.skipif( + "sys.platform != 'win32' or " + "sys.version_info == (3, 13, 0, 'beta', 2)" ), id="unc-path", ),