Skip to content

Improve test_merge_conflict via new prompt_yes_or_no #147

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.

Sign up for GitHub

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

Merged
JohanMabille merged 3 commits into from
Apr 28, 2026
Merged

Improve test_merge_conflict via new prompt_yes_or_no #147

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea59453
Improve `test_merge_conflict` via new `prompt_yes_or_no`
ianthomas23 Apr 27, 2026
f883331
Fix wasm tests
ianthomas23 Apr 27, 2026
fa0279b
Longer initial wait at start of wasm tests
ianthomas23 Apr 27, 2026
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
Prev Previous commit
Longer initial wait at start of wasm tests
  • Loading branch information
@ianthomas23
ianthomas23 committed Apr 27, 2026
commit fa0279b878ad2263760ce72bac868161ee503318
2 changes: 1 addition & 1 deletion test/conftest_wasm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def run_web_server():
cwd = pathlib.Path(__file__).parent.parent / "wasm/test"
proc = subprocess.Popen(["npm", "run", "serve"], stdout=f, stderr=f, cwd=cwd)
# Wait a bit until server ready to receive connections.
time.sleep(0.3)
time.sleep(0.5)
yield
proc.terminate()

Expand Down