test_add_conflict xfail in macos

Author: jdavid

test/test_index.py

@@ -313,6 +313,7 @@ def test_create_empty_read_tree(testrepo):
     index.read_tree(testrepo['fd937514cb799514d4b81bb24c5fcfeb6472b245'])
 
 
+@utils.fails_in_macos
 def test_add_conflict(testrepo):
     ancestor_blob_id = testrepo.create_blob('ancestor')
     ancestor = IndexEntry('conflict.txt', ancestor_blob_id, FileMode.BLOB_EXECUTABLE)

test/test_nonunicode.py

@@ -27,13 +27,22 @@
 
 import os
 import shutil
+import sys
+
+import pytest
 
 import pygit2
 from . import utils
 
 
+# FIXME Detect the filesystem rather than the operating system
+works_in_linux = pytest.mark.xfail(
+    sys.platform != 'linux',
+    reason='fails in macOS/Windows, and also in Linux with the FAT filesystem'
+)
+
 @utils.requires_network
-@utils.requires_linux
+@works_in_linux
 def test_nonunicode_branchname(testrepo):
     folderpath = 'temp_repo_nonutf'
     if os.path.exists(folderpath):

test/utils.py

@@ -66,8 +66,8 @@
 
 requires_refcount = pytest.mark.skipif(is_pypy, reason='skip refcounts checks in pypy')
 
-requires_linux = pytest.mark.xfail(
-    sys.platform != 'linux', reason='probably a bug in libgit2 for non-linux platforms'
+fails_in_macos = pytest.mark.xfail(
+    sys.platform == 'darwin', reason='fails in macOS for an unknown reason'
 )