diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/test/cmd/ci.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/test/container/cli.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/test/test_suite.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/spack/spack/test/cmd/ci.py b/lib/spack/spack/test/cmd/ci.py index d01e1e082d..640ef0d236 100644 --- a/lib/spack/spack/test/cmd/ci.py +++ b/lib/spack/spack/test/cmd/ci.py @@ -954,7 +954,7 @@ def test_ci_rebuild_mock_success( assert "Cannot copy test logs" in out -@pytest.mark.xfail(reason="fails intermittently and covered by gitlab ci") +@pytest.mark.skip(reason="fails intermittently and covered by gitlab ci") def test_ci_rebuild( tmpdir, working_env, diff --git a/lib/spack/spack/test/container/cli.py b/lib/spack/spack/test/container/cli.py index 793af9fbbf..9114e5cbb1 100644 --- a/lib/spack/spack/test/container/cli.py +++ b/lib/spack/spack/test/container/cli.py @@ -33,7 +33,7 @@ def test_listing_possible_os(): def test_bootstrap_phase(minimal_configuration, config_dumper, capsys): minimal_configuration["spack"]["container"]["images"] = { "os": "amazonlinux:2", - "spack": {"resolve_sha": True}, + "spack": {"resolve_sha": False}, } spack_yaml_dir = config_dumper(minimal_configuration) diff --git a/lib/spack/spack/test/test_suite.py b/lib/spack/spack/test/test_suite.py index 7db59526ca..0e041c332e 100644 --- a/lib/spack/spack/test/test_suite.py +++ b/lib/spack/spack/test/test_suite.py @@ -43,7 +43,7 @@ def test_test_log_pathname(mock_packages, config): assert test_suite.test_log_name(spec) in logfile -def test_test_ensure_stage(mock_test_stage): +def test_test_ensure_stage(mock_test_stage, mock_packages): """Make sure test stage directory is properly set up.""" spec = spack.spec.Spec("libdwarf").concretized() |