Skip to content

Commit d572e5f

Browse files
committed
test_add_conflict xfail in macos
1 parent 62bf134 commit d572e5f

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

test/test_index.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ def test_create_empty_read_tree(testrepo):
313313
index.read_tree(testrepo['fd937514cb799514d4b81bb24c5fcfeb6472b245'])
314314

315315

316+
@utils.fails_in_macos
316317
def test_add_conflict(testrepo):
317318
ancestor_blob_id = testrepo.create_blob('ancestor')
318319
ancestor = IndexEntry('conflict.txt', ancestor_blob_id, FileMode.BLOB_EXECUTABLE)

test/test_nonunicode.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,22 @@
2727

2828
import os
2929
import shutil
30+
import sys
31+
32+
import pytest
3033

3134
import pygit2
3235
from . import utils
3336

3437

38+
# FIXME Detect the filesystem rather than the operating system
39+
works_in_linux = pytest.mark.xfail(
40+
sys.platform != 'linux',
41+
reason='fails in macOS/Windows, and also in Linux with the FAT filesystem'
42+
)
43+
3544
@utils.requires_network
36-
@utils.requires_linux
45+
@works_in_linux
3746
def test_nonunicode_branchname(testrepo):
3847
folderpath = 'temp_repo_nonutf'
3948
if os.path.exists(folderpath):

test/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666

6767
requires_refcount = pytest.mark.skipif(is_pypy, reason='skip refcounts checks in pypy')
6868

69-
requires_linux = pytest.mark.xfail(
70-
sys.platform != 'linux', reason='probably a bug in libgit2 for non-linux platforms'
69+
fails_in_macos = pytest.mark.xfail(
70+
sys.platform == 'darwin', reason='fails in macOS for an unknown reason'
7171
)
7272

7373

0 commit comments

Comments
 (0)