From a45ede8596db91abc7f0e365a7c5719863b20f71 Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Wed, 1 May 2024 14:56:14 -0400 Subject: [PATCH 1/2] DRIVERS-2511: Update maxWireVersion from 6 to 21 Once a driver removes support for MongoDB 3.6 and updates its minWireVersion from 6 to 7, these tests start to fail. Bumping from 6 to 21 (MongoDB 7.0 maxWireVersion) should hold us for a while. --- source/resources | 1 + .../server-discovery-and-monitoring/tests/rs/compatible.json | 2 +- .../server-discovery-and-monitoring/tests/rs/compatible.yml | 2 +- .../tests/rs/compatible_unknown.json | 2 +- .../tests/rs/compatible_unknown.yml | 2 +- .../tests/sharded/compatible.json | 2 +- .../tests/sharded/compatible.yml | 2 +- .../tests/single/compatible.json | 2 +- .../tests/single/compatible.yml | 2 +- .../tests/single/too_old_then_upgraded.json | 4 ++-- .../tests/single/too_old_then_upgraded.yml | 4 ++-- 11 files changed, 13 insertions(+), 12 deletions(-) create mode 120000 source/resources diff --git a/source/resources b/source/resources new file mode 120000 index 0000000000..a25ebfe8cd --- /dev/null +++ b/source/resources @@ -0,0 +1 @@ +/Users/jeff.yemin/git/mongo-java-driver/driver-core/src/test/resources \ No newline at end of file diff --git a/source/server-discovery-and-monitoring/tests/rs/compatible.json b/source/server-discovery-and-monitoring/tests/rs/compatible.json index 444b13e9d5..dfd5d57dfa 100644 --- a/source/server-discovery-and-monitoring/tests/rs/compatible.json +++ b/source/server-discovery-and-monitoring/tests/rs/compatible.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ diff --git a/source/server-discovery-and-monitoring/tests/rs/compatible.yml b/source/server-discovery-and-monitoring/tests/rs/compatible.yml index 8b5d9f456a..ce17d7e302 100644 --- a/source/server-discovery-and-monitoring/tests/rs/compatible.yml +++ b/source/server-discovery-and-monitoring/tests/rs/compatible.yml @@ -12,7 +12,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ["b:27017", { ok: 1, diff --git a/source/server-discovery-and-monitoring/tests/rs/compatible_unknown.json b/source/server-discovery-and-monitoring/tests/rs/compatible_unknown.json index cf92dd1ed3..95e03ea958 100644 --- a/source/server-discovery-and-monitoring/tests/rs/compatible_unknown.json +++ b/source/server-discovery-and-monitoring/tests/rs/compatible_unknown.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/source/server-discovery-and-monitoring/tests/rs/compatible_unknown.yml b/source/server-discovery-and-monitoring/tests/rs/compatible_unknown.yml index 643e849819..ed97ab31ac 100644 --- a/source/server-discovery-and-monitoring/tests/rs/compatible_unknown.yml +++ b/source/server-discovery-and-monitoring/tests/rs/compatible_unknown.yml @@ -12,7 +12,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ], outcome: { diff --git a/source/server-discovery-and-monitoring/tests/sharded/compatible.json b/source/server-discovery-and-monitoring/tests/sharded/compatible.json index e531db97f9..ceb0ec24c4 100644 --- a/source/server-discovery-and-monitoring/tests/sharded/compatible.json +++ b/source/server-discovery-and-monitoring/tests/sharded/compatible.json @@ -23,7 +23,7 @@ "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/source/server-discovery-and-monitoring/tests/sharded/compatible.yml b/source/server-discovery-and-monitoring/tests/sharded/compatible.yml index 06d5182a5c..20519089f5 100644 --- a/source/server-discovery-and-monitoring/tests/sharded/compatible.yml +++ b/source/server-discovery-and-monitoring/tests/sharded/compatible.yml @@ -17,7 +17,7 @@ phases: [ isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], outcome: { diff --git a/source/server-discovery-and-monitoring/tests/single/compatible.json b/source/server-discovery-and-monitoring/tests/single/compatible.json index 302927598c..493d9b748e 100644 --- a/source/server-discovery-and-monitoring/tests/single/compatible.json +++ b/source/server-discovery-and-monitoring/tests/single/compatible.json @@ -11,7 +11,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/source/server-discovery-and-monitoring/tests/single/compatible.yml b/source/server-discovery-and-monitoring/tests/single/compatible.yml index b84c1388c3..e183c7127d 100644 --- a/source/server-discovery-and-monitoring/tests/single/compatible.yml +++ b/source/server-discovery-and-monitoring/tests/single/compatible.yml @@ -8,7 +8,7 @@ phases: [ helloOk: true, isWritablePrimary: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], outcome: { diff --git a/source/server-discovery-and-monitoring/tests/single/too_old_then_upgraded.json b/source/server-discovery-and-monitoring/tests/single/too_old_then_upgraded.json index 58ae7d9de4..c3dd98cf62 100644 --- a/source/server-discovery-and-monitoring/tests/single/too_old_then_upgraded.json +++ b/source/server-discovery-and-monitoring/tests/single/too_old_then_upgraded.json @@ -1,5 +1,5 @@ { - "description": "Standalone with default maxWireVersion of 0 is upgraded to one with maxWireVersion 6", + "description": "Standalone with default maxWireVersion of 0 is upgraded to one with maxWireVersion 21", "uri": "mongodb://a", "phases": [ { @@ -35,7 +35,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/source/server-discovery-and-monitoring/tests/single/too_old_then_upgraded.yml b/source/server-discovery-and-monitoring/tests/single/too_old_then_upgraded.yml index aed6bae6e0..87b72b9000 100644 --- a/source/server-discovery-and-monitoring/tests/single/too_old_then_upgraded.yml +++ b/source/server-discovery-and-monitoring/tests/single/too_old_then_upgraded.yml @@ -1,4 +1,4 @@ -description: "Standalone with default maxWireVersion of 0 is upgraded to one with maxWireVersion 6" +description: "Standalone with default maxWireVersion of 0 is upgraded to one with maxWireVersion 21" uri: "mongodb://a" phases: [ { @@ -29,7 +29,7 @@ phases: [ helloOk: true, isWritablePrimary: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], outcome: { From 26fd36b943f17cf3d70f2acde29a43fcb72ca1c3 Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Wed, 1 May 2024 15:47:06 -0400 Subject: [PATCH 2/2] Remove errant symbolic link --- source/resources | 1 - 1 file changed, 1 deletion(-) delete mode 120000 source/resources diff --git a/source/resources b/source/resources deleted file mode 120000 index a25ebfe8cd..0000000000 --- a/source/resources +++ /dev/null @@ -1 +0,0 @@ -/Users/jeff.yemin/git/mongo-java-driver/driver-core/src/test/resources \ No newline at end of file