Skip to content

Commit f3343aa

Browse files
NoahStappNoahStapp
authored
PYTHON-4916 - URI options spec tests specify empty options when the i… (mongodb#1991)
1 parent 2603222 commit f3343aa

9 files changed

+95
-94
lines changed

‎test/uri_options/auth-options.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"tests": [
33
{
44
"description": "Valid auth options are parsed correctly (GSSAPI)",
5-
"uri": "mongodb://foo:[email protected]/?authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME:other,CANONICALIZE_HOST_NAME:true&authSource=$external",
5+
"uri": "mongodb://foo:[email protected]/?authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME:other,CANONICALIZE_HOST_NAME:forward,SERVICE_HOST:example.com&authSource=$external",
66
"valid": true,
77
"warning": false,
88
"hosts": null,
@@ -11,7 +11,8 @@
1111
"authMechanism": "GSSAPI",
1212
"authMechanismProperties": {
1313
"SERVICE_NAME": "other",
14-
"CANONICALIZE_HOST_NAME": true
14+
"SERVICE_HOST": "example.com",
15+
"CANONICALIZE_HOST_NAME": "forward"
1516
},
1617
"authSource": "$external"
1718
}

‎test/uri_options/compression-options.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"warning": true,
3636
"hosts": null,
3737
"auth": null,
38-
"options": {}
38+
"options": null
3939
},
4040
{
4141
"description": "Too low zlibCompressionLevel causes a warning",
@@ -44,7 +44,7 @@
4444
"warning": true,
4545
"hosts": null,
4646
"auth": null,
47-
"options": {}
47+
"options": null
4848
},
4949
{
5050
"description": "Too high zlibCompressionLevel causes a warning",
@@ -53,7 +53,7 @@
5353
"warning": true,
5454
"hosts": null,
5555
"auth": null,
56-
"options": {}
56+
"options": null
5757
}
5858
]
5959
}

‎test/uri_options/concern-options.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"warning": true,
4444
"hosts": null,
4545
"auth": null,
46-
"options": {}
46+
"options": null
4747
},
4848
{
4949
"description": "Too low wTimeoutMS causes a warning",
@@ -52,7 +52,7 @@
5252
"warning": true,
5353
"hosts": null,
5454
"auth": null,
55-
"options": {}
55+
"options": null
5656
},
5757
{
5858
"description": "Invalid journal causes a warning",
@@ -61,7 +61,7 @@
6161
"warning": true,
6262
"hosts": null,
6363
"auth": null,
64-
"options": {}
64+
"options": null
6565
}
6666
]
6767
}

‎test/uri_options/connection-options.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"warning": true,
2828
"hosts": null,
2929
"auth": null,
30-
"options": {}
30+
"options": null
3131
},
3232
{
3333
"description": "Too low connectTimeoutMS causes a warning",
@@ -36,7 +36,7 @@
3636
"warning": true,
3737
"hosts": null,
3838
"auth": null,
39-
"options": {}
39+
"options": null
4040
},
4141
{
4242
"description": "Non-numeric heartbeatFrequencyMS causes a warning",
@@ -45,7 +45,7 @@
4545
"warning": true,
4646
"hosts": null,
4747
"auth": null,
48-
"options": {}
48+
"options": null
4949
},
5050
{
5151
"description": "Too low heartbeatFrequencyMS causes a warning",
@@ -54,7 +54,7 @@
5454
"warning": true,
5555
"hosts": null,
5656
"auth": null,
57-
"options": {}
57+
"options": null
5858
},
5959
{
6060
"description": "Non-numeric localThresholdMS causes a warning",
@@ -63,7 +63,7 @@
6363
"warning": true,
6464
"hosts": null,
6565
"auth": null,
66-
"options": {}
66+
"options": null
6767
},
6868
{
6969
"description": "Too low localThresholdMS causes a warning",
@@ -72,7 +72,7 @@
7272
"warning": true,
7373
"hosts": null,
7474
"auth": null,
75-
"options": {}
75+
"options": null
7676
},
7777
{
7878
"description": "Invalid retryWrites causes a warning",
@@ -81,7 +81,7 @@
8181
"warning": true,
8282
"hosts": null,
8383
"auth": null,
84-
"options": {}
84+
"options": null
8585
},
8686
{
8787
"description": "Non-numeric serverSelectionTimeoutMS causes a warning",
@@ -90,7 +90,7 @@
9090
"warning": true,
9191
"hosts": null,
9292
"auth": null,
93-
"options": {}
93+
"options": null
9494
},
9595
{
9696
"description": "Too low serverSelectionTimeoutMS causes a warning",
@@ -99,7 +99,7 @@
9999
"warning": true,
100100
"hosts": null,
101101
"auth": null,
102-
"options": {}
102+
"options": null
103103
},
104104
{
105105
"description": "Non-numeric socketTimeoutMS causes a warning",
@@ -108,7 +108,7 @@
108108
"warning": true,
109109
"hosts": null,
110110
"auth": null,
111-
"options": {}
111+
"options": null
112112
},
113113
{
114114
"description": "Too low socketTimeoutMS causes a warning",
@@ -117,7 +117,7 @@
117117
"warning": true,
118118
"hosts": null,
119119
"auth": null,
120-
"options": {}
120+
"options": null
121121
},
122122
{
123123
"description": "directConnection=true",
@@ -137,7 +137,7 @@
137137
"warning": false,
138138
"hosts": null,
139139
"auth": null,
140-
"options": {}
140+
"options": null
141141
},
142142
{
143143
"description": "directConnection=false",
@@ -168,7 +168,7 @@
168168
"warning": true,
169169
"hosts": null,
170170
"auth": null,
171-
"options": {}
171+
"options": null
172172
},
173173
{
174174
"description": "loadBalanced=true",
@@ -211,7 +211,7 @@
211211
"warning": true,
212212
"hosts": null,
213213
"auth": null,
214-
"options": {}
214+
"options": null
215215
},
216216
{
217217
"description": "loadBalanced=true with multiple hosts causes an error",
@@ -220,7 +220,7 @@
220220
"warning": false,
221221
"hosts": null,
222222
"auth": null,
223-
"options": {}
223+
"options": null
224224
},
225225
{
226226
"description": "loadBalanced=true with directConnection=true causes an error",
@@ -229,7 +229,7 @@
229229
"warning": false,
230230
"hosts": null,
231231
"auth": null,
232-
"options": {}
232+
"options": null
233233
},
234234
{
235235
"description": "loadBalanced=true with replicaSet causes an error",
@@ -238,7 +238,7 @@
238238
"warning": false,
239239
"hosts": null,
240240
"auth": null,
241-
"options": {}
241+
"options": null
242242
},
243243
{
244244
"description": "timeoutMS=0",
@@ -258,7 +258,7 @@
258258
"warning": true,
259259
"hosts": null,
260260
"auth": null,
261-
"options": {}
261+
"options": null
262262
},
263263
{
264264
"description": "Too low timeoutMS causes a warning",
@@ -267,7 +267,7 @@
267267
"warning": true,
268268
"hosts": null,
269269
"auth": null,
270-
"options": {}
270+
"options": null
271271
}
272272
]
273273
}

‎test/uri_options/connection-pool-options.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"warning": true,
2222
"hosts": null,
2323
"auth": null,
24-
"options": {}
24+
"options": null
2525
},
2626
{
2727
"description": "Too low maxIdleTimeMS causes a warning",
@@ -30,7 +30,7 @@
3030
"warning": true,
3131
"hosts": null,
3232
"auth": null,
33-
"options": {}
33+
"options": null
3434
},
3535
{
3636
"description": "maxPoolSize=0 does not error",
@@ -61,7 +61,7 @@
6161
"warning": true,
6262
"hosts": null,
6363
"auth": null,
64-
"options": {}
64+
"options": null
6565
},
6666
{
6767
"description": "maxConnecting<0 causes a warning",
@@ -70,7 +70,7 @@
7070
"warning": true,
7171
"hosts": null,
7272
"auth": null,
73-
"options": {}
73+
"options": null
7474
}
7575
]
7676
}

‎test/uri_options/sdam-options.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"warning": true,
4141
"hosts": null,
4242
"auth": null,
43-
"options": {}
43+
"options": null
4444
}
4545
]
4646
}

‎test/uri_options/single-threaded-options.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"warning": true,
1919
"hosts": null,
2020
"auth": null,
21-
"options": {}
21+
"options": null
2222
}
2323
]
2424
}

‎test/uri_options/srv-options.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"warning": false,
1919
"hosts": null,
2020
"auth": null,
21-
"options": {}
21+
"options": null
2222
},
2323
{
2424
"description": "SRV URI with srvMaxHosts",
@@ -38,7 +38,7 @@
3838
"warning": true,
3939
"hosts": null,
4040
"auth": null,
41-
"options": {}
41+
"options": null
4242
},
4343
{
4444
"description": "SRV URI with invalid type for srvMaxHosts",
@@ -47,7 +47,7 @@
4747
"warning": true,
4848
"hosts": null,
4949
"auth": null,
50-
"options": {}
50+
"options": null
5151
},
5252
{
5353
"description": "Non-SRV URI with srvMaxHosts",
@@ -56,7 +56,7 @@
5656
"warning": false,
5757
"hosts": null,
5858
"auth": null,
59-
"options": {}
59+
"options": null
6060
},
6161
{
6262
"description": "SRV URI with positive srvMaxHosts and replicaSet",
@@ -65,7 +65,7 @@
6565
"warning": false,
6666
"hosts": null,
6767
"auth": null,
68-
"options": {}
68+
"options": null
6969
},
7070
{
7171
"description": "SRV URI with positive srvMaxHosts and loadBalanced=true",
@@ -74,7 +74,7 @@
7474
"warning": false,
7575
"hosts": null,
7676
"auth": null,
77-
"options": {}
77+
"options": null
7878
},
7979
{
8080
"description": "SRV URI with positive srvMaxHosts and loadBalanced=false",

0 commit comments

Comments
 (0)