Revert "test: fix max wire versions"

durran · durran · commit beb0929b39e0 · 2025-05-06T21:50:52.000+02:00
This reverts commit aa8b839.
diff --git a/test/spec/server-discovery-and-monitoring/rs/null_election_id-pre-6.0.json b/test/spec/server-discovery-and-monitoring/rs/null_election_id-pre-6.0.json
@@ -18,7 +18,7 @@
             "setVersion": 1,
             "setName": "rs",
             "minWireVersion": 0,
-            "maxWireVersion": 25
+            "maxWireVersion": 7
           }
         ]
       ],
@@ -66,7 +66,7 @@
               "$oid": "000000000000000000000002"
             },
             "minWireVersion": 0,
-            "maxWireVersion": 25
+            "maxWireVersion": 7
           }
         ]
       ],
@@ -116,7 +116,7 @@
             "setVersion": 1,
             "setName": "rs",
             "minWireVersion": 0,
-            "maxWireVersion": 25
+            "maxWireVersion": 7
           }
         ]
       ],
@@ -167,7 +167,7 @@
               "$oid": "000000000000000000000001"
             },
             "minWireVersion": 0,
-            "maxWireVersion": 25
+            "maxWireVersion": 7
           }
         ]
       ],
diff --git a/test/spec/server-discovery-and-monitoring/rs/null_election_id-pre-6.0.yml b/test/spec/server-discovery-and-monitoring/rs/null_election_id-pre-6.0.yml
@@ -15,7 +15,7 @@ phases: [
                 setVersion: 1,
                 setName: "rs",
                 minWireVersion: 0,
-                maxWireVersion: 25
+                maxWireVersion: 7
             }]
         ],
 
@@ -57,7 +57,7 @@ phases: [
                 setVersion: 1,
                 electionId: {"$oid": "000000000000000000000002"},
                 minWireVersion: 0,
-                maxWireVersion: 25
+                maxWireVersion: 7
             }]
         ],
 
@@ -99,7 +99,7 @@ phases: [
                 setVersion: 1,
                 setName: "rs",
                 minWireVersion: 0,
-                maxWireVersion: 25
+                maxWireVersion: 7
             }]
         ],
         outcome: {
@@ -142,7 +142,7 @@ phases: [
                 setVersion: 1,
                 electionId: {"$oid": "000000000000000000000001"},
                 minWireVersion: 0,
-                maxWireVersion: 25
+                maxWireVersion: 7
             }]
         ],
         outcome: {
diff --git a/test/spec/server-discovery-and-monitoring/rs/primary_mismatched_me_not_removed.json b/test/spec/server-discovery-and-monitoring/rs/primary_mismatched_me_not_removed.json
@@ -18,7 +18,7 @@
             "primary": "localhost:27017",
             "me": "a:27017",
             "minWireVersion": 0,
-            "maxWireVersion": 25
+            "maxWireVersion": 7
           }
         ]
       ],
@@ -55,7 +55,7 @@
             "primary": "localhost:27017",
             "me": "localhost:27018",
             "minWireVersion": 0,
-            "maxWireVersion": 25
+            "maxWireVersion": 7
           }
         ]
       ],
diff --git a/test/spec/server-discovery-and-monitoring/rs/primary_mismatched_me_not_removed.yml b/test/spec/server-discovery-and-monitoring/rs/primary_mismatched_me_not_removed.yml
@@ -19,7 +19,7 @@ phases: [
         # servers from a primary isWritablePrimary are added to the working server set
         me: "a:27017",
         minWireVersion: 0,
-        maxWireVersion: 25
+        maxWireVersion: 7
       }]
     ],
     outcome: {
@@ -53,7 +53,7 @@ phases: [
         primary: "localhost:27017",
         me: "localhost:27018",
         minWireVersion: 0,
-        maxWireVersion: 25
+        maxWireVersion: 7
       }]
     ],
     outcome: {
diff --git a/test/spec/server-discovery-and-monitoring/rs/setversion_without_electionid-pre-6.0.json b/test/spec/server-discovery-and-monitoring/rs/setversion_without_electionid-pre-6.0.json
@@ -17,7 +17,7 @@
             "setName": "rs",
             "setVersion": 2,
             "minWireVersion": 0,
-            "maxWireVersion": 25
+            "maxWireVersion": 7
           }
         ]
       ],
@@ -56,7 +56,7 @@
             "setName": "rs",
             "setVersion": 1,
             "minWireVersion": 0,
-            "maxWireVersion": 25
+            "maxWireVersion": 7
           }
         ]
       ],
diff --git a/test/spec/server-discovery-and-monitoring/rs/setversion_without_electionid-pre-6.0.yml b/test/spec/server-discovery-and-monitoring/rs/setversion_without_electionid-pre-6.0.yml
@@ -15,7 +15,7 @@ phases: [
                 setName: "rs",
                 setVersion: 2,
                 minWireVersion: 0,
-                maxWireVersion: 25
+                maxWireVersion: 7
             }]
         ],
 
@@ -52,7 +52,7 @@ phases: [
                 setName: "rs",
                 setVersion: 1,
                 minWireVersion: 0,
-                maxWireVersion: 25
+                maxWireVersion: 7
             }]
         ],
 
diff --git a/test/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid-pre-6.0.json b/test/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid-pre-6.0.json
@@ -20,7 +20,7 @@
               "$oid": "000000000000000000000001"
             },
             "minWireVersion": 0,
-            "maxWireVersion": 25
+            "maxWireVersion": 7
           }
         ]
       ],
@@ -64,7 +64,7 @@
             "setName": "rs",
             "setVersion": 2,
             "minWireVersion": 0,
-            "maxWireVersion": 25
+            "maxWireVersion": 7
           }
         ]
       ],
@@ -109,7 +109,7 @@
               "$oid": "000000000000000000000002"
             },
             "minWireVersion": 0,
-            "maxWireVersion": 25
+            "maxWireVersion": 7
           }
         ]
       ],
diff --git a/test/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid-pre-6.0.yml b/test/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid-pre-6.0.yml
@@ -16,7 +16,7 @@ phases: [
                 setVersion: 1,
                 electionId: {"$oid": "000000000000000000000001"},
                 minWireVersion: 0,
-                maxWireVersion: 25
+                maxWireVersion: 7
             }]
         ],
 
@@ -53,7 +53,7 @@ phases: [
                 setName: "rs",
                 setVersion: 2,
                 minWireVersion: 0,
-                maxWireVersion: 25
+                maxWireVersion: 7
             }]
         ],
 
@@ -92,7 +92,7 @@ phases: [
                 setVersion: 1,
                 electionId: {"$oid": "000000000000000000000002"},
                 minWireVersion: 0,
-                maxWireVersion: 25
+                maxWireVersion: 7
             }]
         ],
         outcome: {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`"setVersion": 1,`
`19`	`19`	`"setName": "rs",`
`20`	`20`	`"minWireVersion": 0,`
`21`		`- "maxWireVersion": 25`
	`21`	`+ "maxWireVersion": 7`
`22`	`22`	`}`
`23`	`23`	`]`
`24`	`24`	`],`
`@@ -66,7 +66,7 @@`
`66`	`66`	`"$oid": "000000000000000000000002"`
`67`	`67`	`},`
`68`	`68`	`"minWireVersion": 0,`
`69`		`- "maxWireVersion": 25`
	`69`	`+ "maxWireVersion": 7`
`70`	`70`	`}`
`71`	`71`	`]`
`72`	`72`	`],`
`@@ -116,7 +116,7 @@`
`116`	`116`	`"setVersion": 1,`
`117`	`117`	`"setName": "rs",`
`118`	`118`	`"minWireVersion": 0,`
`119`		`- "maxWireVersion": 25`
	`119`	`+ "maxWireVersion": 7`
`120`	`120`	`}`
`121`	`121`	`]`
`122`	`122`	`],`
`@@ -167,7 +167,7 @@`
`167`	`167`	`"$oid": "000000000000000000000001"`
`168`	`168`	`},`
`169`	`169`	`"minWireVersion": 0,`
`170`		`- "maxWireVersion": 25`
	`170`	`+ "maxWireVersion": 7`
`171`	`171`	`}`
`172`	`172`	`]`
`173`	`173`	`],`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"setName": "rs",`
`18`	`18`	`"setVersion": 2,`
`19`	`19`	`"minWireVersion": 0,`
`20`		`- "maxWireVersion": 25`
	`20`	`+ "maxWireVersion": 7`
`21`	`21`	`}`
`22`	`22`	`]`
`23`	`23`	`],`
`@@ -56,7 +56,7 @@`
`56`	`56`	`"setName": "rs",`
`57`	`57`	`"setVersion": 1,`
`58`	`58`	`"minWireVersion": 0,`
`59`		`- "maxWireVersion": 25`
	`59`	`+ "maxWireVersion": 7`
`60`	`60`	`}`
`61`	`61`	`]`
`62`	`62`	`],`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`"$oid": "000000000000000000000001"`
`21`	`21`	`},`
`22`	`22`	`"minWireVersion": 0,`
`23`		`- "maxWireVersion": 25`
	`23`	`+ "maxWireVersion": 7`
`24`	`24`	`}`
`25`	`25`	`]`
`26`	`26`	`],`
`@@ -64,7 +64,7 @@`
`64`	`64`	`"setName": "rs",`
`65`	`65`	`"setVersion": 2,`
`66`	`66`	`"minWireVersion": 0,`
`67`		`- "maxWireVersion": 25`
	`67`	`+ "maxWireVersion": 7`
`68`	`68`	`}`
`69`	`69`	`]`
`70`	`70`	`],`
`@@ -109,7 +109,7 @@`
`109`	`109`	`"$oid": "000000000000000000000002"`
`110`	`110`	`},`
`111`	`111`	`"minWireVersion": 0,`
`112`		`- "maxWireVersion": 25`
	`112`	`+ "maxWireVersion": 7`
`113`	`113`	`}`
`114`	`114`	`]`
`115`	`115`	`],`