Skip to content

Commit c6c3a1f

Browse files
kclowesmarioevz
andauthored
chore(ci): Remove deprecated macos-latest in favor of macos-15 (#1905)
* chore(ci): Remove deprecated macos-latest in favor of macos-15 * fix: unit test --------- Co-authored-by: Mario Vega <[email protected]>
1 parent 2932e3b commit c6c3a1f

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

.github/workflows/tox_verify.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
strategy:
112112
matrix:
113113
include:
114-
- os: macos-latest
114+
- os: macos-15
115115
python: "3.11"
116116
- os: ubuntu-latest
117117
python: "3.12"
@@ -155,8 +155,8 @@ jobs:
155155
- os: [self-hosted-ghr, size-xl-x64]
156156
name: self-hosted-ghr-xl-x64
157157
python: "3.11"
158-
- os: macos-latest
159-
name: macos-latest
158+
- os: macos-15
159+
name: macos-15
160160
python: "3.12"
161161
steps:
162162
- name: Checkout ethereum/execution-spec-tests
@@ -190,7 +190,7 @@ jobs:
190190
include:
191191
- os: ubuntu-latest
192192
python: "3.11"
193-
- os: macos-latest
193+
- os: macos-15
194194
python: "3.12"
195195
steps:
196196
- name: Checkout ethereum/execution-spec-tests

src/pytest_plugins/filler/tests/test_output_directory.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ def run_fill(
4040
"""Create a function to run the fill command with various output directory scenarios."""
4141

4242
def _run_fill(
43-
output_dir: Path, clean: bool = False, expect_failure: bool = False
43+
output_dir: Path,
44+
clean: bool = False,
45+
expect_failure: bool = False,
46+
disable_capture_output: bool = False,
4447
) -> pytest.RunResult:
4548
"""Run the fill command with the specified output directory and clean flag."""
4649
pytester.copy_example(name=str(test_path))
@@ -58,6 +61,9 @@ def _run_fill(
5861
]
5962
if clean:
6063
args.append("--clean")
64+
if disable_capture_output:
65+
# Required for tests on stdout
66+
args.append("-s")
6167

6268
result = pytester.runpytest(*args)
6369

@@ -157,12 +163,13 @@ def test_fill_stdout_always_works(tmp_path_factory: TempPathFactory, run_fill):
157163
"""Test filling to stdout always works regardless of output state."""
158164
stdout_path = Path("stdout")
159165
# create a directory called "stdout" - it should not have any effect
160-
output_dir = tmp_path_factory.mktemp(stdout_path.name)
166+
output_dir = tmp_path_factory.mktemp(stdout_path.name, numbered=False)
167+
assert str(output_dir.stem) == "stdout"
161168
meta_dir = output_dir / ".meta"
162169
meta_dir.mkdir()
163170
(meta_dir / "existing_meta_file.txt").write_text("This is metadata")
164171

165-
result: pytest.RunResult = run_fill(stdout_path)
172+
result: pytest.RunResult = run_fill(stdout_path, disable_capture_output=True)
166173

167174
assert any(
168175
"test_chainid.py::test_chainid[fork_Cancun-state_test]" in line for line in result.outlines

0 commit comments

Comments
 (0)