From edcae5440d3a81375c830785635783d359b92bfe Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 2 Jun 2025 08:22:09 -0500 Subject: [PATCH] MOTOR-1466 & MOTOR-1467 Skip test and move to MacOS 14 (#338) --- .evergreen/config.yml | 31 ++++--------------------------- doc/tutorial-asyncio.rst | 2 +- doc/tutorial-tornado.rst | 2 +- motor/core.py | 2 +- motor/web.py | 1 + synchro/synchrotest.py | 2 ++ 6 files changed, 10 insertions(+), 30 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index f05ee4c7..e67101c0 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -616,23 +616,6 @@ tasks: vars: TOX_ENV: doctest - - name: "assign-pr-reviewer" - tags: ["pr"] - allowed_requesters: ["patch", "github_pr"] - commands: - - command: shell.exec - type: test - params: - shell: "bash" - working_dir: src - script: | - ${PREPARE_SHELL} - set -x - export CONFIG=$PROJECT_DIRECTORY/.github/reviewers.txt - export SCRIPT="$DRIVERS_TOOLS/.evergreen/github_app/assign-reviewer.sh" - bash $SCRIPT -p $CONFIG -h ${github_commit} -o "mongodb" -n "motor" - echo '{"results": [{ "status": "PASS", "test_file": "Build", "log_raw": "Test completed" } ]}' > ${PROJECT_DIRECTORY}/test-results.json - # }}} axes: @@ -751,9 +734,9 @@ axes: - id: "win" display_name: "Windows" run_on: "windows-64-vsMulti-small" - - id: "macos-1100" - display_name: "macOS 11.00" - run_on: "macos-1100" + - id: "macos-1400" + display_name: "macOS 14.00" + run_on: "macos-1400" buildvariants: @@ -816,7 +799,7 @@ buildvariants: - matrix_name: "test-macos" display_name: "${os}-${tox-env-osx}-${ssl}" matrix_spec: - os: "macos-1100" + os: "macos-1400" tox-env-osx: "*" ssl: "*" tasks: @@ -853,9 +836,3 @@ buildvariants: PYTHON_BINARY: "/opt/python/3.9/bin/python3" tasks: - name: "doctest" - -- name: rhel8-pr-assign-reviewer - display_name: Assign PR Reviewer - run_on: rhel87-small - tasks: - - name: "assign-pr-reviewer" diff --git a/doc/tutorial-asyncio.rst b/doc/tutorial-asyncio.rst index e2aa22e4..663319c4 100644 --- a/doc/tutorial-asyncio.rst +++ b/doc/tutorial-asyncio.rst @@ -270,7 +270,7 @@ You can apply a sort, limit, or skip to a query before you begin iterating: The cursor does not actually retrieve each document from the server individually; it gets documents efficiently in `large batches`_. -.. _`large batches`: https://mongodb.com/docs/manual/tutorial/iterate-a-cursor/#cursor-batches +.. _`large batches`: https://www.mongodb.com/docs/manual/core/cursors/#cursor-batches Counting Documents ------------------ diff --git a/doc/tutorial-tornado.rst b/doc/tutorial-tornado.rst index 6611ed7d..b6f8c104 100644 --- a/doc/tutorial-tornado.rst +++ b/doc/tutorial-tornado.rst @@ -357,7 +357,7 @@ You can apply a sort, limit, or skip to a query before you begin iterating: The cursor does not actually retrieve each document from the server individually; it gets documents efficiently in `large batches`_. -.. _`large batches`: https://mongodb.com/docs/manual/tutorial/iterate-a-cursor/#cursor-batches +.. _`large batches`: https://www.mongodb.com/docs/manual/core/cursors/#cursor-batches Counting Documents ------------------ diff --git a/motor/core.py b/motor/core.py index 9ecf1807..f1f3ea05 100644 --- a/motor/core.py +++ b/motor/core.py @@ -1497,7 +1497,7 @@ class AgnosticBaseCursor(AgnosticBase): .. versionchanged:: 2.2 Deprecated. - .. _`large batches`: https://www.mongodb.com/docs/manual/tutorial/iterate-a-cursor/#cursor-batches + .. _`large batches`: https://www.mongodb.com/docs/manual/core/cursors/#cursor-batches .. _`gen.coroutine`: http://tornadoweb.org/en/stable/gen.html """ warnings.warn( diff --git a/motor/web.py b/motor/web.py index 4cce6d71..6e94eecf 100644 --- a/motor/web.py +++ b/motor/web.py @@ -140,6 +140,7 @@ class GridFSHandler(tornado.web.RequestHandler): ims_value = self.request.headers.get("If-Modified-Since") if ims_value is not None: date_tuple = email.utils.parsedate(ims_value) + assert date_tuple is not None # If our MotorClient is tz-aware, assume the naive ims_value is in # its time zone. diff --git a/synchro/synchrotest.py b/synchro/synchrotest.py index 62a6a3e0..5b61e0c7 100644 --- a/synchro/synchrotest.py +++ b/synchro/synchrotest.py @@ -207,6 +207,8 @@ excluded_tests = [ # Motor does not allow calling to_list on a tailable cursor. "TestCursor.test_max_await_time_ms", "TestCursor.test_to_list_tailable", + # This test relies on a private api" + "TestTransactions.test_transaction_pool_cleared_error_labelled_transient", # Newer tests not implemented in Motor "TestClient.test_repr_srv_host", "TestGridfs.test_delete_by_name",