diff --git a/tests/core/pyspec/eth2spec/test/context.py b/tests/core/pyspec/eth2spec/test/context.py index e805e1c120..0a140ee432 100644 --- a/tests/core/pyspec/eth2spec/test/context.py +++ b/tests/core/pyspec/eth2spec/test/context.py @@ -428,6 +428,12 @@ def decorator(fn): return with_phases([phase for phase in all_phases if is_post_fork(phase, earliest_phase)])(fn) return decorator +def with_all_phases_from_except(earliest_phase, except_phases=None): + """ + A decorator factory for running a tests with every phase except the ones listed + """ + return with_all_phases_from(earliest_phase, [phase for phase in ALL_PHASES if phase not in except_phases]) + def with_all_phases_except(exclusion_phases): """ diff --git a/tests/core/pyspec/eth2spec/test/deneb/fork_choice/test_on_block.py b/tests/core/pyspec/eth2spec/test/deneb/fork_choice/test_on_block.py index 2334fcdc8a..c4d6ff4f68 100644 --- a/tests/core/pyspec/eth2spec/test/deneb/fork_choice/test_on_block.py +++ b/tests/core/pyspec/eth2spec/test/deneb/fork_choice/test_on_block.py @@ -2,7 +2,7 @@ from eth2spec.test.context import ( spec_state_test, - with_phases, + with_all_phases_from_except, ) from eth2spec.test.helpers.constants import DENEB @@ -36,7 +36,7 @@ def get_block_with_blob(spec, state, rng=None): return block, blobs, blob_kzg_proofs -@with_phases([DENEB]) +@with_all_phases_from_except(DENEB, [EIP7594]) @spec_state_test def test_simple_blob_data(spec, state): rng = Random(1234) @@ -71,7 +71,7 @@ def test_simple_blob_data(spec, state): yield 'steps', test_steps -@with_phases([DENEB]) +@with_all_phases_from_except(DENEB, [EIP7594]) @spec_state_test def test_invalid_incorrect_proof(spec, state): rng = Random(1234) @@ -99,7 +99,7 @@ def test_invalid_incorrect_proof(spec, state): yield 'steps', test_steps -@with_phases([DENEB]) +@with_all_phases_from_except(DENEB, [EIP7594]) @spec_state_test def test_invalid_data_unavailable(spec, state): rng = Random(1234) @@ -127,7 +127,7 @@ def test_invalid_data_unavailable(spec, state): yield 'steps', test_steps -@with_phases([DENEB]) +@with_all_phases_from_except(DENEB, [EIP7594]) @spec_state_test def test_invalid_wrong_proofs_length(spec, state): rng = Random(1234) @@ -155,7 +155,7 @@ def test_invalid_wrong_proofs_length(spec, state): yield 'steps', test_steps -@with_phases([DENEB]) +@with_all_phases_from_except(DENEB, [EIP7594]) @spec_state_test def test_invalid_wrong_blobs_length(spec, state): rng = Random(1234)