concretizer tests: clean up temporary values
This commit is contained in:
@@ -859,8 +859,7 @@ def test_conditional_variants(self, spec_str, expected, unexpected):
|
||||
def test_conditional_variants_fail(self, bad_spec):
|
||||
with pytest.raises(
|
||||
(spack.error.UnsatisfiableSpecError,
|
||||
vt.InvalidVariantForSpecError,
|
||||
spack.error.SpackError)
|
||||
vt.InvalidVariantForSpecError)
|
||||
):
|
||||
_ = Spec('conditional-variant-pkg' + bad_spec).concretized()
|
||||
|
||||
@@ -1433,7 +1432,7 @@ def test_provider_must_meet_requirements(self):
|
||||
# A package can be a provider of a virtual only if the underlying
|
||||
# requirements are met.
|
||||
s = spack.spec.Spec('unsat-virtual-dependency')
|
||||
with pytest.raises((RuntimeError, spack.error.UnsatisfiableSpecError, spack.error.SpackError)):
|
||||
with pytest.raises((RuntimeError, spack.error.UnsatisfiableSpecError)):
|
||||
s.concretize()
|
||||
|
||||
@pytest.mark.regression('23951')
|
||||
@@ -1537,7 +1536,7 @@ def test_conditional_values_in_variants(self, spec_str):
|
||||
)
|
||||
|
||||
s = Spec(spec_str)
|
||||
with pytest.raises((RuntimeError, spack.error.UnsatisfiableSpecError, spack.error.SpackError)):
|
||||
with pytest.raises((RuntimeError, spack.error.UnsatisfiableSpecError)):
|
||||
s.concretize()
|
||||
|
||||
def test_conditional_values_in_conditional_variant(self):
|
||||
|
||||
Reference in New Issue
Block a user