Skip to content

[Spec Resync] 06-03-2026 - #2841

Merged
blink1073 merged 3 commits into
masterfrom
spec-resync-06-03-2026
Jun 3, 2026
Merged

blink1073 merged 3 commits into
masterfrom
spec-resync-06-03-2026

Conversation

@mongodb-drivers-pr-bot

Copy link
Copy Markdown
Contributor

Jira tickets: https://jira.mongodb.org/issues/?jql=labels%20%3D%20automated-sync%20AND%20status%20!%3D%20Closed

The following specs were changed:
-connection_monitoring
-load_balancer
-server_selection_logging
-transactions
-transactions-convenient-api

The following spec syncs encountered errors:
-applying patches

'

The following directories are in the specification repository and not in our test directory:
-causal_consistency
-open_telemetry

@mongodb-drivers-pr-bot
mongodb-drivers-pr-bot Bot requested a review from a team as a code owner June 3, 2026 01:30
@blink1073
blink1073 requested review from blink1073 and removed request for aclark4life June 3, 2026 01:32
- Fix apply_patches to glob *.patch files only (not directories) so the
  permanent/ subdirectory no longer breaks git apply
- Include permanent/*.patch in the patch list
- Remove incorrect -R flag; all patches are forward patches
- Add PYTHON-5809.patch to revert afterClusterTime readConcern changes
  in transaction tests that PyMongo does not yet implement
- Revert load_balancer, server_selection_logging, and transaction test
  changes from upstream; these are handled by existing permanent patches
  and the new PYTHON-5809 patch respectively
@blink1073
blink1073 marked this pull request as draft June 3, 2026 12:38
@codecov-commenter

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

Newer MongoDB executes $where in WASM and returns Interrupted (11601)
instead of MaxTimeMSExpired (50) when max_time_ms kills the execution.
PyMongo only appends the configured timeout details for code 50, so the
assertIn check was failing. Make the assertion conditional on the error
being an ExecutionTimeout (code 50).
@blink1073
blink1073 marked this pull request as ready for review June 3, 2026 16:14
try:
# Avoid shell=True by passing arguments as a list.
# Note: glob expansion doesn't work in shell=False, so we use a list of files.
patches = [str(p) for p in pathlib.Path("./.evergreen/spec-patch/").glob("*")]

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was a bug fix. We weren't properly applying patches from the permanent folder.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my bad 🤦 thanks for catching that!

@blink1073
blink1073 requested a review from sleepyStick June 3, 2026 16:15

@sleepyStick sleepyStick left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm pending passing evergreen tests -- thanks!

@blink1073
blink1073 merged commit 7c21277 into master Jun 3, 2026
89 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants