Testbschubert/test-skips

1 files changed, 23 insertions, 23 deletions

diff --git a/tests/sources/git.py b/tests/sources/git.py
index 245f90131..604548a13 100644
--- a/tests/sources/git.py
+++ b/tests/sources/git.py
@@ -42,7 +42,7 @@ DATA_DIR = os.path.join(
 )
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 def test_fetch_bad_ref(cli, tmpdir, datafiles):
     project = str(datafiles)
@@ -68,7 +68,7 @@ def test_fetch_bad_ref(cli, tmpdir, datafiles):
     result.assert_task_error(ErrorDomain.SOURCE, None)
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 def test_submodule_fetch_checkout(cli, tmpdir, datafiles):
     project = str(datafiles)
@@ -107,7 +107,7 @@ def test_submodule_fetch_checkout(cli, tmpdir, datafiles):
     assert os.path.exists(os.path.join(checkoutdir, 'subdir', 'ponyfile.txt'))
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 def test_submodule_fetch_source_enable_explicit(cli, tmpdir, datafiles):
     project = str(datafiles)
@@ -146,7 +146,7 @@ def test_submodule_fetch_source_enable_explicit(cli, tmpdir, datafiles):
     assert os.path.exists(os.path.join(checkoutdir, 'subdir', 'ponyfile.txt'))
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 def test_submodule_fetch_source_disable(cli, tmpdir, datafiles):
     project = str(datafiles)
@@ -185,7 +185,7 @@ def test_submodule_fetch_source_disable(cli, tmpdir, datafiles):
     assert not os.path.exists(os.path.join(checkoutdir, 'subdir', 'ponyfile.txt'))
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 def test_submodule_fetch_submodule_does_override(cli, tmpdir, datafiles):
     project = str(datafiles)
@@ -224,7 +224,7 @@ def test_submodule_fetch_submodule_does_override(cli, tmpdir, datafiles):
     assert os.path.exists(os.path.join(checkoutdir, 'subdir', 'ponyfile.txt'))
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 def test_submodule_fetch_submodule_individual_checkout(cli, tmpdir, datafiles):
     project = str(datafiles)
@@ -269,7 +269,7 @@ def test_submodule_fetch_submodule_individual_checkout(cli, tmpdir, datafiles):
     assert os.path.exists(os.path.join(checkoutdir, 'othersubdir', 'unicornfile.txt'))
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 def test_submodule_fetch_submodule_individual_checkout_explicit(cli, tmpdir, datafiles):
     project = str(datafiles)
@@ -314,7 +314,7 @@ def test_submodule_fetch_submodule_individual_checkout_explicit(cli, tmpdir, dat
     assert os.path.exists(os.path.join(checkoutdir, 'othersubdir', 'unicornfile.txt'))
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'project-override'))
 def test_submodule_fetch_project_override(cli, tmpdir, datafiles):
     project = str(datafiles)
@@ -353,7 +353,7 @@ def test_submodule_fetch_project_override(cli, tmpdir, datafiles):
     assert not os.path.exists(os.path.join(checkoutdir, 'subdir', 'ponyfile.txt'))
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 def test_submodule_track_ignore_inconsistent(cli, tmpdir, datafiles):
     project = str(datafiles)
@@ -390,7 +390,7 @@ def test_submodule_track_ignore_inconsistent(cli, tmpdir, datafiles):
     assert "Ignoring inconsistent submodule" in result.stderr
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 def test_submodule_track_no_ref_or_track(cli, tmpdir, datafiles):
     project = str(datafiles)
@@ -417,7 +417,7 @@ def test_submodule_track_no_ref_or_track(cli, tmpdir, datafiles):
     result.assert_task_error(None, None)
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 @pytest.mark.parametrize("fail", ['warn', 'error'])
 def test_ref_not_in_track(cli, tmpdir, datafiles, fail):
@@ -460,7 +460,7 @@ def test_ref_not_in_track(cli, tmpdir, datafiles, fail):
         assert "ref-not-in-track" in result.stderr
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 @pytest.mark.parametrize("fail", ['warn', 'error'])
 def test_unlisted_submodule(cli, tmpdir, datafiles, fail):
@@ -533,7 +533,7 @@ def test_unlisted_submodule(cli, tmpdir, datafiles, fail):
         assert "git:unlisted-submodule" in result.stderr
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 @pytest.mark.parametrize("fail", ['warn', 'error'])
 def test_track_unlisted_submodule(cli, tmpdir, datafiles, fail):
@@ -596,7 +596,7 @@ def test_track_unlisted_submodule(cli, tmpdir, datafiles, fail):
         assert "git:unlisted-submodule" in result.stderr
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 @pytest.mark.parametrize("fail", ['warn', 'error'])
 def test_invalid_submodule(cli, tmpdir, datafiles, fail):
@@ -667,8 +667,8 @@ def test_invalid_submodule(cli, tmpdir, datafiles, fail):
         assert "git:invalid-submodule" in result.stderr
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
-@pytest.mark.skipif(HAVE_OLD_GIT, reason="old git rm does not update .gitmodules")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_OLD_GIT, reason="old git rm does not update .gitmodules")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 @pytest.mark.parametrize("fail", ['warn', 'error'])
 def test_track_invalid_submodule(cli, tmpdir, datafiles, fail):
@@ -729,7 +729,7 @@ def test_track_invalid_submodule(cli, tmpdir, datafiles, fail):
         assert "git:invalid-submodule" in result.stderr
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 @pytest.mark.parametrize("ref_format", ['sha1', 'git-describe'])
 @pytest.mark.parametrize("tag,extra_commit", [(False, False), (True, False), (True, True)])
@@ -776,8 +776,8 @@ def test_track_fetch(cli, tmpdir, datafiles, ref_format, tag, extra_commit):
     result.assert_success()
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
-@pytest.mark.skipif(HAVE_OLD_GIT, reason="old git describe lacks --first-parent")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_OLD_GIT, reason="old git describe lacks --first-parent")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 @pytest.mark.parametrize("ref_storage", [('inline'), ('project.refs')])
 @pytest.mark.parametrize("tag_type", [('annotated'), ('lightweight')])
@@ -891,7 +891,7 @@ def test_git_describe(cli, tmpdir, datafiles, ref_storage, tag_type):
     assert p.returncode != 0
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 @pytest.mark.parametrize("ref_storage", [('inline'), ('project.refs')])
 @pytest.mark.parametrize("tag_type", [('annotated'), ('lightweight')])
@@ -1008,7 +1008,7 @@ def test_git_describe_head_is_tagged(cli, tmpdir, datafiles, ref_storage, tag_ty
     assert p.returncode != 0
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 def test_git_describe_relevant_history(cli, tmpdir, datafiles):
     project = str(datafiles)
@@ -1088,7 +1088,7 @@ def test_git_describe_relevant_history(cli, tmpdir, datafiles):
     assert set(rev_list.splitlines()) == set([head, tagged_ref, branch_boundary])
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 def test_default_do_not_track_tags(cli, tmpdir, datafiles):
     project = str(datafiles)
@@ -1129,7 +1129,7 @@ def test_default_do_not_track_tags(cli, tmpdir, datafiles):
     assert 'tags' not in source
 
 
-@pytest.mark.skipif(HAVE_GIT is False, reason="git is not available")
+@pytest.mark.xfail(HAVE_GIT is False, reason="git is not available")
 @pytest.mark.datafiles(os.path.join(DATA_DIR, 'template'))
 def test_overwrite_rogue_tag_multiple_remotes(cli, tmpdir, datafiles):
     """When using multiple remotes in cache (i.e. when using aliases), we