Skip to content

Commit a4adea6

Browse files
authored
fix(consume): allow absolute paths for --evm-bin (#1052)
* fix(consume): enable --evm-bin with absolute paths If the value passed to --evm-bin was an abolute path, it got ignored by pytest. Perhaps, it got interpreted as a test paths? This workaround avoids the problem. * chore(consume): better default value for --evm-bin with consume direct The default value of the TransitionTool (`ethereum-spec-evm-resolver`) doesn't support state- or blocktest consumption; use the Geth `evm` binary in PATH as the default value. * docs: update changelog
1 parent 94bde07 commit a4adea6

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

docs/CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,9 @@ Test fixtures for use by clients are available for each release on the [Github r
6565
- ✨ Add a default location for evm logs (`--evm-dump-dir`) when filling tests ([#999](https://github.com/ethereum/execution-spec-tests/pull/999)).
6666
- ✨ Slow tests now have greater timeout when making a request to the T8N server ([#1037](https://github.com/ethereum/execution-spec-tests/pull/1037)).
6767
- ✨ Introduce [`fork_covariant_parametrize`](https://ethereum.github.io/execution-spec-tests/main/writing_tests/test_markers/#custom-fork-covariant-markers) helper function ([#1019](https://github.com/ethereum/execution-spec-tests/pull/1019)).
68-
- 🔀 Update EIP-7251 according to [spec updates](https://github.com/ethereum/EIPs/pull/9127) ([#1024](https://github.com/ethereum/execution-spec-tests/pull/1024))
69-
- 🔀 Update EIP-7002 according to [spec updates](https://github.com/ethereum/EIPs/pull/9119) ([#1024](https://github.com/ethereum/execution-spec-tests/pull/1024))
68+
- 🔀 Update EIP-7251 according to [spec updates](https://github.com/ethereum/EIPs/pull/9127) ([#1024](https://github.com/ethereum/execution-spec-tests/pull/1024)).
69+
- 🔀 Update EIP-7002 according to [spec updates](https://github.com/ethereum/EIPs/pull/9119) ([#1024](https://github.com/ethereum/execution-spec-tests/pull/1024)).
70+
- 🐞 fix(consume): allow absolute paths with `--evm-bin` ([#1052](https://github.com/ethereum/execution-spec-tests/pull/1052)).
7071

7172
### 🔧 EVM Tools
7273

src/cli/pytest_commands/consume.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ def create_command(
7878
)
7979
@common_click_options
8080
def command(pytest_args: List[str], **kwargs) -> None:
81-
args = handle_consume_command_flags(pytest_args, is_hive)
82-
args += [str(p) for p in command_paths]
81+
args = [str(p) for p in command_paths]
82+
args += handle_consume_command_flags(pytest_args, is_hive)
8383
sys.exit(pytest.main(args))
8484

8585
return command

src/pytest_plugins/consume/direct/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def pytest_addoption(parser): # noqa: D103
2828
action="store",
2929
dest="evm_bin",
3030
type=Path,
31-
default=None,
31+
default=Path("evm"),
3232
help=(
3333
"Path to an evm executable that provides `blocktest`. Default: First 'evm' entry in "
3434
"PATH."

0 commit comments

Comments
 (0)