SERVER-48442: Fix change_streams.js to test events in any order

1 files changed, 17 insertions, 6 deletions

diff --git a/jstests/sharding/change_streams.js b/jstests/sharding/change_streams.js
index c9a9c41fa1c..22ecb4bf295 100644
--- a/jstests/sharding/change_streams.js
+++ b/jstests/sharding/change_streams.js
@@ -136,23 +136,34 @@ function runTest(collName, shardKey) {
 
     assert.commandWorked(mongosColl.update({a: 0}, {$set: {b: 2}}, {multi: true}));
 
-    assert.soon(() => changeStream.hasNext());
-    assertChangeStreamEventEq(changeStream.next(), {
+    const expectedEvent1 = {
         operationType: "update",
         ns: {db: mongosDB.getName(), coll: mongosColl.getName()},
         documentKey: makeShardKeyDocument(-10),
         updateDescription: {updatedFields: {b: 2}, removedFields: []},
-    });
+    };
 
-    assert.soon(() => changeStream.hasNext());
-    assertChangeStreamEventEq(changeStream.next(), {
+    const expectedEvent2 = {
         operationType: "update",
         ns: {db: mongosDB.getName(), coll: mongosColl.getName()},
         documentKey: makeShardKeyDocument(10),
         updateDescription: {updatedFields: {b: 2}, removedFields: []},
-    });
+    };
+
+    // The multi-update events can be observed in any order, depending on the clusterTime at which
+    // they are written on each shard.
+    const expectedEvents = [expectedEvent1, expectedEvent2];
+
+    const actualEvents = [];
+    for (let expectedEvent of expectedEvents) {
+        assert.soon(() => changeStream.hasNext());
+        const actualEvent = changeStream.next();
+        actualEvents.push(pruneOptionalFields(actualEvent, expectedEvent));
+    }
     changeStream.close();
 
+    assert.sameMembers(actualEvents, expectedEvents);
+
     // Test that it is legal to open a change stream, even if the
     // 'internalQueryProhibitMergingOnMongos' parameter is set.
     assert.commandWorked(