Testbschubert/test-skips

1 files changed, 16 insertions, 16 deletions

diff --git a/tests/integration/shell.py b/tests/integration/shell.py
index b0de76ef5..a82329c42 100644
--- a/tests/integration/shell.py
+++ b/tests/integration/shell.py
@@ -56,7 +56,7 @@ def execute_shell(cli, project, command, *, config=None, mount=None, element='ba
 # Test running something through a shell, allowing it to find the
 # executable
 @pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
+@pytest.mark.xfail(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
 def test_shell(cli, datafiles):
     project = str(datafiles)
 
@@ -67,7 +67,7 @@ def test_shell(cli, datafiles):
 
 # Test running an executable directly
 @pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
+@pytest.mark.xfail(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
 def test_executable(cli, datafiles):
     project = str(datafiles)
 
@@ -79,7 +79,7 @@ def test_executable(cli, datafiles):
 # Test shell environment variable explicit assignments
 @pytest.mark.parametrize("animal", [("Horse"), ("Pony")])
 @pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
+@pytest.mark.xfail(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
 # This test seems to fail or pass depending on if this file is run or the hole test suite
 def test_env_assign(cli, datafiles, animal):
     project = str(datafiles)
@@ -100,7 +100,7 @@ def test_env_assign(cli, datafiles, animal):
 # Test shell environment variable explicit assignments with host env var expansion
 @pytest.mark.parametrize("animal", [("Horse"), ("Pony")])
 @pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
+@pytest.mark.xfail(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
 # This test seems to fail or pass depending on if this file is run or the hole test suite
 def test_env_assign_expand_host_environ(cli, datafiles, animal):
     project = str(datafiles)
@@ -124,7 +124,7 @@ def test_env_assign_expand_host_environ(cli, datafiles, animal):
 # when running an isolated shell
 @pytest.mark.parametrize("animal", [("Horse"), ("Pony")])
 @pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
+@pytest.mark.xfail(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
 # This test seems to faili or pass depending on if this file is run or the hole test suite
 def test_env_assign_isolated(cli, datafiles, animal):
     project = str(datafiles)
@@ -143,7 +143,7 @@ def test_env_assign_isolated(cli, datafiles, animal):
 # Test running an executable in a runtime with no shell (i.e., no
 # /bin/sh)
 @pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
+@pytest.mark.xfail(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
 def test_no_shell(cli, datafiles):
     project = str(datafiles)
     element_path = os.path.join(project, 'elements')
@@ -176,7 +176,7 @@ def test_no_shell(cli, datafiles):
 # Test that bind mounts defined in project.conf work
 @pytest.mark.parametrize("path", [("/etc/pony.conf"), ("/usr/share/pony/pony.txt")])
 @pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
+@pytest.mark.xfail(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
 @pytest.mark.xfail(HAVE_SANDBOX == 'buildbox', reason='Not working with BuildBox', strict=True)
 def test_host_files(cli, datafiles, path):
     project = str(datafiles)
@@ -198,7 +198,7 @@ def test_host_files(cli, datafiles, path):
 # Test that bind mounts defined in project.conf work
 @pytest.mark.parametrize("path", [("/etc"), ("/usr/share/pony")])
 @pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
+@pytest.mark.xfail(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
 @pytest.mark.xfail(HAVE_SANDBOX == 'buildbox', reason='Not working with BuildBox', strict=True)
 def test_host_files_expand_environ(cli, datafiles, path):
     project = str(datafiles)
@@ -225,7 +225,7 @@ def test_host_files_expand_environ(cli, datafiles, path):
 # Test that bind mounts defined in project.conf dont mount in isolation
 @pytest.mark.parametrize("path", [("/etc/pony.conf"), ("/usr/share/pony/pony.txt")])
 @pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
+@pytest.mark.xfail(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
 def test_isolated_no_mount(cli, datafiles, path):
     project = str(datafiles)
     ponyfile = os.path.join(project, 'files', 'shell-mount', 'pony.txt')
@@ -248,7 +248,7 @@ def test_isolated_no_mount(cli, datafiles, path):
 # declared as optional, and that there is no warning if it is optional
 @pytest.mark.parametrize("optional", [("mandatory"), ("optional")])
 @pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
+@pytest.mark.xfail(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
 def test_host_files_missing(cli, datafiles, optional):
     project = str(datafiles)
     ponyfile = os.path.join(project, 'files', 'shell-mount', 'horsy.txt')
@@ -281,7 +281,7 @@ def test_host_files_missing(cli, datafiles, optional):
 # Test that bind mounts defined in project.conf work
 @pytest.mark.parametrize("path", [("/etc/pony.conf"), ("/usr/share/pony/pony.txt")])
 @pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
+@pytest.mark.xfail(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
 @pytest.mark.xfail(HAVE_SANDBOX == 'buildbox', reason='Not working with BuildBox', strict=True)
 def test_cli_mount(cli, datafiles, path):
     project = str(datafiles)
@@ -294,7 +294,7 @@ def test_cli_mount(cli, datafiles, path):
 
 # Test that we can see the workspace files in a shell
 @pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
+@pytest.mark.xfail(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
 def test_workspace_visible(cli, datafiles):
     project = str(datafiles)
     workspace = os.path.join(cli.directory, 'workspace')
@@ -328,7 +328,7 @@ def test_workspace_visible(cli, datafiles):
 
 # Test that '--sysroot' works
 @pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
+@pytest.mark.xfail(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
 @pytest.mark.xfail(HAVE_SANDBOX == 'buildbox', reason='Not working with BuildBox', strict=True)
 def test_sysroot(cli, tmpdir, datafiles):
     project = str(datafiles)
@@ -359,7 +359,7 @@ def test_sysroot(cli, tmpdir, datafiles):
 
 # Test system integration commands can access devices in /dev
 @pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
+@pytest.mark.xfail(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
 def test_integration_devices(cli, datafiles):
     project = str(datafiles)
     element_name = 'integration.bst'
@@ -372,7 +372,7 @@ def test_integration_devices(cli, datafiles):
 @pytest.mark.datafiles(DATA_DIR)
 @pytest.mark.parametrize("build_shell", [("build"), ("nobuild")])
 @pytest.mark.parametrize("guess_element", [True, False], ids=["guess", "no-guess"])
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
+@pytest.mark.xfail(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
 def test_integration_external_workspace(cli, tmpdir_factory, datafiles, build_shell, guess_element):
     tmpdir = tmpdir_factory.mktemp("")
     project = str(datafiles)
@@ -405,7 +405,7 @@ def test_integration_external_workspace(cli, tmpdir_factory, datafiles, build_sh
 
 
 @pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
+@pytest.mark.xfail(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
 def test_integration_partial_artifact(cli, datafiles, tmpdir, integration_cache):
 
     project = str(datafiles)