Revert "Mark xfail test that only fail in CI"

This reverts commit b54c8cb07ca257be79940ffa70853bf75d2c287c.

1 files changed, 3 insertions, 13 deletions

diff --git a/tests/integration/shell.py b/tests/integration/shell.py
index 8ea5d5e69..b0eca2471 100644
--- a/tests/integration/shell.py
+++ b/tests/integration/shell.py
@@ -57,8 +57,6 @@ def execute_shell(cli, project, command, *, config=None, mount=None, element='ba
 # executable
 @pytest.mark.datafiles(DATA_DIR)
 @pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
-@pytest.mark.xfail(HAVE_SANDBOX == 'buildbox', reason='Not working with BuildBox')
-# Not stricked xfail as only fails in CI
 def test_shell(cli, datafiles):
     project = str(datafiles)
 
@@ -70,8 +68,6 @@ 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(HAVE_SANDBOX == 'buildbox', reason='Not working with BuildBox')
-# Not stricked xfail as only fails in CI
 def test_executable(cli, datafiles):
     project = str(datafiles)
 
@@ -85,7 +81,7 @@ def test_executable(cli, datafiles):
 @pytest.mark.datafiles(DATA_DIR)
 @pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
 @pytest.mark.xfail(HAVE_SANDBOX == 'buildbox', reason='Not working with BuildBox')
-# Not stricked xfail as only fails in CI
+# 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)
     expected = animal + '\n'
@@ -107,7 +103,7 @@ def test_env_assign(cli, datafiles, animal):
 @pytest.mark.datafiles(DATA_DIR)
 @pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
 @pytest.mark.xfail(HAVE_SANDBOX == 'buildbox', reason='Not working with BuildBox')
-# Not stricked xfail as only fails in CI
+# 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)
     expected = 'The animal is: {}\n'.format(animal)
@@ -132,7 +128,7 @@ def test_env_assign_expand_host_environ(cli, datafiles, animal):
 @pytest.mark.datafiles(DATA_DIR)
 @pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
 @pytest.mark.xfail(HAVE_SANDBOX == 'buildbox', reason='Not working with BuildBox')
-# Not stricked xfail as only fails in CI
+# 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)
     result = execute_shell(cli, project, ['/bin/sh', '-c', 'echo ${ANIMAL}'], isolate=True, config={
@@ -151,8 +147,6 @@ def test_env_assign_isolated(cli, datafiles, animal):
 # /bin/sh)
 @pytest.mark.datafiles(DATA_DIR)
 @pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
-@pytest.mark.xfail(HAVE_SANDBOX == 'buildbox', reason='Not working with BuildBox')
-# Not stricked xfail as only fails in CI
 def test_no_shell(cli, datafiles):
     project = str(datafiles)
     element_path = os.path.join(project, 'elements')
@@ -372,8 +366,6 @@ 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(HAVE_SANDBOX == 'buildbox', reason='Not working with BuildBox')
-# Not stricked xfail as only fails in CI
 def test_integration_devices(cli, datafiles):
     project = str(datafiles)
     element_name = 'integration.bst'
@@ -421,8 +413,6 @@ 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(HAVE_SANDBOX == 'buildbox', reason='Not working with BuildBox')
-# Not stricked xfail as only fails in CI
 def test_integration_partial_artifact(cli, datafiles, tmpdir, integration_cache):
 
     project = str(datafiles)