File tree Expand file tree Collapse file tree 3 files changed +13
-3
lines changed Expand file tree Collapse file tree 3 files changed +13
-3
lines changed Original file line number Diff line number Diff line change @@ -313,6 +313,7 @@ def test_create_empty_read_tree(testrepo):
313
313
index .read_tree (testrepo ['fd937514cb799514d4b81bb24c5fcfeb6472b245' ])
314
314
315
315
316
+ @utils .fails_in_macos
316
317
def test_add_conflict (testrepo ):
317
318
ancestor_blob_id = testrepo .create_blob ('ancestor' )
318
319
ancestor = IndexEntry ('conflict.txt' , ancestor_blob_id , FileMode .BLOB_EXECUTABLE )
Original file line number Diff line number Diff line change 27
27
28
28
import os
29
29
import shutil
30
+ import sys
31
+
32
+ import pytest
30
33
31
34
import pygit2
32
35
from . import utils
33
36
34
37
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
+
35
44
@utils .requires_network
36
- @utils . requires_linux
45
+ @works_in_linux
37
46
def test_nonunicode_branchname (testrepo ):
38
47
folderpath = 'temp_repo_nonutf'
39
48
if os .path .exists (folderpath ):
Original file line number Diff line number Diff line change 66
66
67
67
requires_refcount = pytest .mark .skipif (is_pypy , reason = 'skip refcounts checks in pypy' )
68
68
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 '
71
71
)
72
72
73
73
You can’t perform that action at this time.
0 commit comments