Skip to content

Commit ff414d5

Browse files
committed
It looks like pypy supports fspath already
1 parent eff9734 commit ff414d5

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

test/test_nonunicode.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
from . import utils
3333

3434

35-
bstring = b'\xc3master'
36-
3735
@utils.requires_network
3836
@utils.requires_linux
3937
def test_nonunicode_branchname(testrepo):
@@ -43,6 +41,7 @@ def test_nonunicode_branchname(testrepo):
4341
newrepo = pygit2.clone_repository(
4442
path=folderpath, url='https://github.com/pygit2/test_branch_notutf.git'
4543
)
44+
bstring = b'\xc3master'
4645
assert bstring in [
4746
(ref.split('/')[-1]).encode('utf8', 'surrogateescape')
4847
for ref in newrepo.listall_references()

test/test_repository.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,6 @@ def test_discover_repo(tmp_path):
629629
assert repo.path == discover_repository(str(subdir))
630630

631631

632-
@utils.requires_fspath
633632
def test_discover_repo_aspath(tmp_path):
634633
repo = init_repository(Path(tmp_path), False)
635634
subdir = Path(tmp_path) / 'test1' / 'test2'
@@ -811,7 +810,6 @@ def _check_worktree(worktree):
811810
assert testrepo.list_worktrees() == []
812811

813812

814-
@utils.requires_fspath
815813
def test_worktree_aspath(testrepo):
816814
worktree_name = 'foo'
817815
worktree_dir = Path(tempfile.mkdtemp())

test/utils.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,23 +58,16 @@
5858
requires_proxy = pytest.mark.skipif(not has_proxy, reason='Requires proxy at port 8888')
5959

6060
requires_ssh = pytest.mark.skipif(
61-
pygit2.enums.Feature.SSH not in pygit2.features,
62-
reason='Requires SSH'
61+
pygit2.enums.Feature.SSH not in pygit2.features, reason='Requires SSH'
6362
)
6463

6564

6665
is_pypy = '__pypy__' in sys.builtin_module_names
6766

68-
requires_fspath = pytest.mark.xfail(
69-
is_pypy,
70-
reason="PyPy doesn't fully support fspath, see https://foss.heptapod.net/pypy/pypy/-/issues/3168",
71-
)
72-
7367
requires_refcount = pytest.mark.skipif(is_pypy, reason='skip refcounts checks in pypy')
7468

7569
requires_linux = pytest.mark.xfail(
76-
sys.platform != 'linux',
77-
reason='probably a bug in libgit2 for non-linux platforms'
70+
sys.platform != 'linux', reason='probably a bug in libgit2 for non-linux platforms'
7871
)
7972

8073

0 commit comments

Comments
 (0)