Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix merge_mods in test generators #2578

Merged
merged 1 commit into from
Aug 31, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions tests/generators/epoch_processing/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
} # also run the previous phase 0 tests

# No epoch-processing changes in Merge and previous testing repeats with new types, so no additional tests required.
# TODO: rebase onto Altair testing later.
merge_mods = phase_0_mods
merge_mods = altair_mods

# TODO Custody Game testgen is disabled for now
# custody_game_mods = {**{key: 'eth2spec.test.custody_game.epoch_processing.test_process_' + key for key in [
Expand Down
2 changes: 1 addition & 1 deletion tests/generators/finality/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
if __name__ == "__main__":
phase_0_mods = {'finality': 'eth2spec.test.phase0.finality.test_finality'}
altair_mods = phase_0_mods # No additional Altair specific finality tests
merge_mods = phase_0_mods # No additional Merge specific finality tests
merge_mods = altair_mods # No additional Merge specific finality tests

all_mods = {
PHASE0: phase_0_mods,
Expand Down
4 changes: 2 additions & 2 deletions tests/generators/fork_choice/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
]}
# No additional Altair specific finality tests, yet.
altair_mods = phase_0_mods
# No specific Merge tests yet. TODO: rebase onto Altair testing later.
merge_mods = phase_0_mods
# No specific Merge tests yet.
merge_mods = altair_mods

all_mods = {
PHASE0: phase_0_mods,
Expand Down
2 changes: 1 addition & 1 deletion tests/generators/operations/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
**{key: 'eth2spec.test.merge.block_processing.test_process_' + key for key in [
'execution_payload',
]},
**phase_0_mods, # TODO: runs phase0 tests. Rebase to include `altair_mods` testing later.
**altair_mods,
}

# TODO Custody Game testgen is disabled for now
Expand Down
2 changes: 1 addition & 1 deletion tests/generators/rewards/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# No additional merge specific rewards tests, yet.
# Note: Block rewards are non-epoch rewards and are tested as part of block processing tests.
# Transaction fees are part of the execution-layer.
merge_mods = phase_0_mods
merge_mods = altair_mods

all_mods = {
PHASE0: phase_0_mods,
Expand Down
6 changes: 2 additions & 4 deletions tests/generators/sanity/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@
]}
altair_mods = {**{key: 'eth2spec.test.altair.sanity.test_' + key for key in [
'blocks',
]}, **phase_0_mods} # also run the previous phase 0 tests

# Altair-specific test cases are ignored, but should be included after the Merge is rebased onto Altair work.
]}, **phase_0_mods}
merge_mods = {**{key: 'eth2spec.test.merge.sanity.test_' + key for key in [
'blocks',
]}, **phase_0_mods} # TODO: Merge inherits phase0 tests for now.
]}, **altair_mods}

all_mods = {
PHASE0: phase_0_mods,
Expand Down