From 7bae6ea69a3e249f4b4bb5e3d29c66849784e55e Mon Sep 17 00:00:00 2001
From: Noah Stapp <noah.stapp@mongodb.com>
Date: Tue, 1 Apr 2025 14:28:20 -0400
Subject: [PATCH] PYTHON-5250 - Change streams expanded events present by
 default in 8.2+

---
 test/asynchronous/test_change_stream.py       |  9 ++-
 .../change-streams-disambiguatedPaths.json    | 64 -------------------
 .../unified/change-streams.json               | 12 +++-
 test/test_change_stream.py                    |  9 ++-
 4 files changed, 27 insertions(+), 67 deletions(-)

diff --git a/test/asynchronous/test_change_stream.py b/test/asynchronous/test_change_stream.py
index 4025c13730..0260cb7a82 100644
--- a/test/asynchronous/test_change_stream.py
+++ b/test/asynchronous/test_change_stream.py
@@ -410,7 +410,14 @@ async def test_change_operations(self):
             expected_update_description = {"updatedFields": {"new": 1}, "removedFields": ["foo"]}
             if async_client_context.version.at_least(4, 5, 0):
                 expected_update_description["truncatedArrays"] = []
-            self.assertEqual(expected_update_description, change["updateDescription"])
+            self.assertEqual(
+                expected_update_description,
+                {
+                    k: v
+                    for k, v in change["updateDescription"].items()
+                    if k in expected_update_description
+                },
+            )
             # Replace.
             await self.watched_collection().replace_one({"new": 1}, {"foo": "bar"})
             change = await change_stream.next()
diff --git a/test/change_streams/unified/change-streams-disambiguatedPaths.json b/test/change_streams/unified/change-streams-disambiguatedPaths.json
index e6cc5ef66e..a8667b5436 100644
--- a/test/change_streams/unified/change-streams-disambiguatedPaths.json
+++ b/test/change_streams/unified/change-streams-disambiguatedPaths.json
@@ -42,70 +42,6 @@
     }
   ],
   "tests": [
-    {
-      "description": "disambiguatedPaths is not present when showExpandedEvents is false/unset",
-      "operations": [
-        {
-          "name": "insertOne",
-          "object": "collection0",
-          "arguments": {
-            "document": {
-              "_id": 1,
-              "a": {
-                "1": 1
-              }
-            }
-          }
-        },
-        {
-          "name": "createChangeStream",
-          "object": "collection0",
-          "arguments": {
-            "pipeline": []
-          },
-          "saveResultAsEntity": "changeStream0"
-        },
-        {
-          "name": "updateOne",
-          "object": "collection0",
-          "arguments": {
-            "filter": {
-              "_id": 1
-            },
-            "update": {
-              "$set": {
-                "a.1": 2
-              }
-            }
-          }
-        },
-        {
-          "name": "iterateUntilDocumentOrError",
-          "object": "changeStream0",
-          "expectResult": {
-            "operationType": "update",
-            "ns": {
-              "db": "database0",
-              "coll": "collection0"
-            },
-            "updateDescription": {
-              "updatedFields": {
-                "$$exists": true
-              },
-              "removedFields": {
-                "$$exists": true
-              },
-              "truncatedArrays": {
-                "$$exists": true
-              },
-              "disambiguatedPaths": {
-                "$$exists": false
-              }
-            }
-          }
-        }
-      ]
-    },
     {
       "description": "disambiguatedPaths is present on updateDescription when an ambiguous path is present",
       "operations": [
diff --git a/test/change_streams/unified/change-streams.json b/test/change_streams/unified/change-streams.json
index c8b60ed4e2..a155d85b6e 100644
--- a/test/change_streams/unified/change-streams.json
+++ b/test/change_streams/unified/change-streams.json
@@ -181,7 +181,12 @@
                   "field": "array",
                   "newSize": 2
                 }
-              ]
+              ],
+              "disambiguatedPaths": {
+                "$$unsetOrMatches": {
+                  "$$exists": true
+                }
+              }
             }
           }
         }
@@ -1408,6 +1413,11 @@
                 "$$unsetOrMatches": {
                   "$$exists": true
                 }
+              },
+              "disambiguatedPaths": {
+                "$$unsetOrMatches": {
+                  "$$exists": true
+                }
               }
             }
           }
diff --git a/test/test_change_stream.py b/test/test_change_stream.py
index e50f4667f6..6099829031 100644
--- a/test/test_change_stream.py
+++ b/test/test_change_stream.py
@@ -406,7 +406,14 @@ def test_change_operations(self):
             expected_update_description = {"updatedFields": {"new": 1}, "removedFields": ["foo"]}
             if client_context.version.at_least(4, 5, 0):
                 expected_update_description["truncatedArrays"] = []
-            self.assertEqual(expected_update_description, change["updateDescription"])
+            self.assertEqual(
+                expected_update_description,
+                {
+                    k: v
+                    for k, v in change["updateDescription"].items()
+                    if k in expected_update_description
+                },
+            )
             # Replace.
             self.watched_collection().replace_one({"new": 1}, {"foo": "bar"})
             change = change_stream.next()