Adjust/add skips/xfails for the tests which are now failing on GH act…

…ions on NFS

Kept a skip where test could have stalled.

datalad/support/tests/test_annexrepo.py

@@ -108,6 +108,7 @@
     ok_file_has_content,
     ok_file_under_git,
     ok_git_config_not_empty,
+    on_github,
     on_nfs,
     on_travis,
     serve_path_via_http,
@@ -2332,7 +2333,7 @@ def test_annexjson_protocol_incorrect(path=None, *, print_opt, caplog):
 # see https://github.com/datalad/datalad/pull/5400 for troubleshooting
 # for stalling with unlock=False, and then with unlock=True it took >= 300 sec
 # https://github.com/datalad/datalad/pull/5433#issuecomment-784470028
-@skip_if(on_travis and on_nfs)  # TODO. stalls
+@skip_if((on_github or on_travis) and on_nfs)  # TODO. stalled on travis, fails on github
 # http://git-annex.branchable.com/bugs/cannot_commit___34__annex_add__34__ed_modified_file_which_switched_its_largefile_status_to_be_committed_to_git_now/#comment-bf70dd0071de1bfdae9fd4f736fd1ec
 # https://github.com/datalad/datalad/issues/1651
 @known_failure_githubci_win

datalad/tests/test_archives.py

@@ -33,6 +33,7 @@
     eq_,
     ok_file_has_content,
     ok_generator,
+    on_github,
     on_nfs,
     on_travis,
     on_windows,
@@ -102,7 +103,7 @@ def check_decompress_file(leading_directories, path=None):
         eq_(f.read(), '3 load')
 
 
-@pytest.mark.xfail(on_travis and on_nfs, reason="https://github.com/datalad/datalad/issues/4496")
+@pytest.mark.xfail((on_travis or on_github) and on_nfs, reason="https://github.com/datalad/datalad/issues/4496")
 @pytest.mark.parametrize("leading", [None, 'strip'])
 def test_decompress_file(leading):
     return check_decompress_file(leading)
@@ -194,6 +195,7 @@ def test_compress_file(ext, annex):
     check_compress_file(ext, annex)
 
 
+@pytest.mark.xfail(on_github and on_nfs, reason="unknown. TODO: figure out")
 @with_tree(**tree_simplearchive)
 def test_ExtractedArchive(path=None):
     archive = op.join(path, fn_archive_obscure_ext)

datalad/tests/test_tests_utils_pytest.py

@@ -69,6 +69,8 @@
     ok_good_symlink,
     ok_startswith,
     ok_symlink,
+    on_github,
+    on_nfs,
     on_windows,
     patch_config,
     probe_known_failure,
@@ -93,6 +95,8 @@
     getpwd,
 )
 
+import pytest
+
 #
 # Test with_tempfile, especially nested invocations
 #
@@ -168,6 +172,8 @@ def test_get_resolved_values():
     with patch_config({'datalad.tests.nonetwork': '1'}):
         eq_(_get_resolved_flavors(flavors), ['local'])
 
+
+@pytest.mark.xfail(on_github and on_nfs, reason="unknown. TODO: figure out")
 def test_with_tempfile_mkdir():
     dnames = []  # just to store the name within the decorated function